From 09538d84f250032619d73db0786771570b9062e4 Mon Sep 17 00:00:00 2001 From: Jonas Kvinge Date: Wed, 2 Jan 2019 16:02:34 +0100 Subject: [PATCH] Fix Qt 5 build (#6246) --- 3rdparty/qocoa/CMakeLists.txt | 7 ++++++- src/CMakeLists.txt | 10 +--------- 2 files changed, 7 insertions(+), 10 deletions(-) diff --git a/3rdparty/qocoa/CMakeLists.txt b/3rdparty/qocoa/CMakeLists.txt index a52ee2e24..df6ec7c5c 100644 --- a/3rdparty/qocoa/CMakeLists.txt +++ b/3rdparty/qocoa/CMakeLists.txt @@ -29,4 +29,9 @@ endif() add_library(Qocoa STATIC ${SOURCES} ${MOC_SOURCES} ${RESOURCES_SOURCES} ) -target_link_libraries(Qocoa Qt5::Widgets Qt5::MacExtras) + +if(APPLE) + target_link_libraries(Qocoa Qt5::Widgets Qt5::MacExtras) +else() + target_link_libraries(Qocoa Qt5::Widgets) +endif() diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 88dff3c20..95515a30c 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -1245,21 +1245,13 @@ target_link_libraries(clementine_lib libclementine-tagreader libclementine-remote - Qt5::Concurrent - Qt5::Core - Qt5::Network - Qt5::OpenGL - Qt5::OpenGL - Qt5::Sql - Qt5::Widgets - Qt5::Xml - ${TAGLIB_LIBRARIES} ${MYGPOQT5_LIBRARIES} ${CHROMAPRINT_LIBRARIES} ${GOBJECT_LIBRARIES} ${GLIB_LIBRARIES} ${GIO_LIBRARIES} + ${QT_LIBRARIES} ${GSTREAMER_BASE_LIBRARIES} ${GSTREAMER_LIBRARIES} ${GSTREAMER_APP_LIBRARIES}