From 170c64cd8bef9df2ea88dd4f72eec641c250bcfd Mon Sep 17 00:00:00 2001 From: David Sansome Date: Mon, 14 Dec 2015 00:02:07 +1100 Subject: [PATCH] Link statically to libprotobuf from the spotifyblob --- CMakeLists.txt | 2 ++ ext/clementine-spotifyblob/CMakeLists.txt | 1 + ext/libclementine-common/CMakeLists.txt | 1 - ext/libclementine-remote/CMakeLists.txt | 1 + ext/libclementine-tagreader/CMakeLists.txt | 1 + 5 files changed, 5 insertions(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index e4cc4cdff..831c323f9 100644 --- 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++) diff --git a/ext/clementine-spotifyblob/CMakeLists.txt b/ext/clementine-spotifyblob/CMakeLists.txt index f971216b5..02c25e8ce 100644 --- 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 ) diff --git a/ext/libclementine-common/CMakeLists.txt b/ext/libclementine-common/CMakeLists.txt index 6b45be6a9..60cb945b4 100644 --- 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} ) diff --git a/ext/libclementine-remote/CMakeLists.txt b/ext/libclementine-remote/CMakeLists.txt index f6fc7685a..5f860fbcd 100644 --- 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 ) diff --git a/ext/libclementine-tagreader/CMakeLists.txt b/ext/libclementine-tagreader/CMakeLists.txt index 52372a16b..39b159929 100644 --- 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 )