From 1558b7215d8eea471b195df57002ec305c95bdb6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Eberhard=20Gr=C3=A4ther?= Date: Tue, 3 Dec 2019 23:59:36 +0100 Subject: [PATCH] build: Changes to compile on Debian Buster (#827) based on #784 --- CMakeLists.txt | 21 +++++++++++++-------- 1 file changed, 13 insertions(+), 8 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 5e6f4200..4929eb55 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -222,10 +222,15 @@ target_include_directories(${LIB_UTILITY_PROJECT_NAME} SYSTEM PUBLIC ${Boost_INCLUDE_DIR} ) -if(UNIX) - target_link_libraries(${LIB_UTILITY_PROJECT_NAME} ${Boost_LIBRARIES} Qt5::Widgets Qt5::Network) -else() - target_link_libraries(${LIB_UTILITY_PROJECT_NAME} ${Boost_LIBRARIES} Qt5::Widgets Qt5::Network Qt5::WinExtras) +target_link_libraries(${LIB_UTILITY_PROJECT_NAME} ${Boost_LIBRARIES} Qt5::Widgets Qt5::Network) + +if (UNIX AND NOT APPLE) + find_package(Threads REQUIRED) + target_link_libraries(${LIB_UTILITY_PROJECT_NAME} ${CMAKE_DL_LIBS} rt ${CMAKE_THREAD_LIBS_INIT}) +endif() + +if (WIN32) + target_link_libraries(${LIB_UTILITY_PROJECT_NAME} Qt5::WinExtras) endif() @@ -438,10 +443,10 @@ add_custom_target( add_library(${LIB_GUI_PROJECT_NAME} ${LIB_GUI_FILES} ${CMAKE_BINARY_DIR}/src/lib_gui/productVersion.h) -if(UNIX) - target_link_libraries(${LIB_GUI_PROJECT_NAME} ${LIB_UTILITY_PROJECT_NAME} ${LIB_PROJECT_NAME} Qt5::Widgets Qt5::Network Qt5::Svg) -else() - target_link_libraries(${LIB_GUI_PROJECT_NAME} ${LIB_UTILITY_PROJECT_NAME} ${LIB_PROJECT_NAME} Qt5::Widgets Qt5::Network Qt5::Svg Qt5::WinExtras) +target_link_libraries(${LIB_GUI_PROJECT_NAME} ${LIB_UTILITY_PROJECT_NAME} ${LIB_PROJECT_NAME} Qt5::Widgets Qt5::Network Qt5::Svg) + +if (WIN32) + target_link_libraries(${LIB_GUI_PROJECT_NAME} Qt5::WinExtras) endif() # command for versioning script