diff --git a/slsDetectorSoftware/CMakeLists.txt b/slsDetectorSoftware/CMakeLists.txt index 1073e23c3..599907da6 100755 --- a/slsDetectorSoftware/CMakeLists.txt +++ b/slsDetectorSoftware/CMakeLists.txt @@ -15,7 +15,6 @@ add_library(slsDetectorShared SHARED ${HEADERS} ) - # Do we have link time optimization? check_ipo_supported(RESULT LTO_AVAILABLE) if(LTO_AVAILABLE) @@ -28,13 +27,15 @@ target_include_directories(slsDetectorShared PUBLIC "$" ) -target_link_libraries(slsDetectorShared PUBLIC - slsProjectOptions - slsProjectWarnings +target_link_libraries(slsDetectorShared + PUBLIC slsSupportLib - zmq pthread rt + PRIVATE + slsProjectOptions + slsProjectWarnings + ${ZeroMQ_LIBRARIES} ) diff --git a/slsSupportLib/CMakeLists.txt b/slsSupportLib/CMakeLists.txt index be82b7f48..546e08f0e 100755 --- a/slsSupportLib/CMakeLists.txt +++ b/slsSupportLib/CMakeLists.txt @@ -61,11 +61,14 @@ set_target_properties(slsSupportLib PROPERTIES message(${ZeroMQ_LIBRARIES}) target_link_libraries(slsSupportLib + PRIVATE + ${ZeroMQ_LIBRARIES} slsProjectOptions slsProjectWarnings - # ${ZeroMQ_LIBRARIES} - zmq - rapidjson) + rapidjson +) + + if (SLS_USE_TESTS) add_subdirectory(tests)