Link statically to libprotobuf from the spotifyblob

2015-12-14 00:02:07 +11:00 · 2015-12-14 00:02:07 +11:00 · 170c64cd8b
parent ea0480f32c
commit 170c64cd8b
5 changed files with 5 additions and 1 deletions
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@ -56,6 +56,8 @@ find_package(PkgConfig REQUIRED)
 find_package(Protobuf REQUIRED)
 find_package(FFTW3)

+find_library(PROTOBUF_STATIC_LIBRARY libprotobuf.a libprotobuf)
+
 pkg_check_modules(CDIO libcdio)
 pkg_check_modules(CHROMAPRINT REQUIRED libchromaprint)
 pkg_search_module(CRYPTOPP cryptopp libcrypto++)
--- a/ext/clementine-spotifyblob/CMakeLists.txt
+++ b/ext/clementine-spotifyblob/CMakeLists.txt
@ -46,6 +46,7 @@ target_link_libraries(clementine-spotifyblob
  ${QT_QTNETWORK_LIBRARY}
  ${GSTREAMER_BASE_LIBRARIES}
  ${GSTREAMER_APP_LIBRARIES}
+  ${PROTOBUF_STATIC_LIBRARY}
  clementine-spotifyblob-messages
  libclementine-common
 )
--- a/ext/libclementine-common/CMakeLists.txt
+++ b/ext/libclementine-common/CMakeLists.txt
@ -33,7 +33,6 @@ add_library(libclementine-common STATIC
 )

 target_link_libraries(libclementine-common
-  ${PROTOBUF_LIBRARY}
  ${TAGLIB_LIBRARIES}
  ${CMAKE_THREAD_LIBS_INIT}
 )
--- a/ext/libclementine-remote/CMakeLists.txt
+++ b/ext/libclementine-remote/CMakeLists.txt
@ -11,6 +11,7 @@ add_library(libclementine-remote STATIC
 )

 target_link_libraries(libclementine-remote
+  ${PROTOBUF_LIBRARY}
  libclementine-common
 )

--- a/ext/libclementine-tagreader/CMakeLists.txt
+++ b/ext/libclementine-tagreader/CMakeLists.txt
@ -38,6 +38,7 @@ add_library(libclementine-tagreader STATIC
 )

 target_link_libraries(libclementine-tagreader
+  ${PROTOBUF_LIBRARY}
  libclementine-common
 )