From 8747ca04f31563b563e88c17676f1ab930908acf Mon Sep 17 00:00:00 2001 From: Dhanya Thattil Date: Fri, 19 Jun 2020 13:28:54 +0200 Subject: [PATCH] zmq back in --- slsReceiverSoftware/CMakeLists.txt | 18 ++++++++---------- 1 file changed, 8 insertions(+), 10 deletions(-) diff --git a/slsReceiverSoftware/CMakeLists.txt b/slsReceiverSoftware/CMakeLists.txt index 9c1a6a343..dc38d40aa 100644 --- a/slsReceiverSoftware/CMakeLists.txt +++ b/slsReceiverSoftware/CMakeLists.txt @@ -41,12 +41,12 @@ include_directories( include ) -#add_library(zmq STATIC IMPORTED GLOBAL) +add_library(zmq STATIC IMPORTED GLOBAL) -#set(ZMQ_STATIC_ARCHIVE ${CMAKE_CURRENT_SOURCE_DIR}/include/libzmq.a) -#set_target_properties(zmq PROPERTIES -# IMPORTED_LOCATION ${ZMQ_STATIC_ARCHIVE} -#) +set(ZMQ_STATIC_ARCHIVE ${CMAKE_CURRENT_SOURCE_DIR}/include/libzmq.a) +set_target_properties(zmq PROPERTIES + IMPORTED_LOCATION ${ZMQ_STATIC_ARCHIVE} +) add_library(slsReceiverStatic STATIC ${SOURCES} @@ -88,7 +88,7 @@ set_target_properties(slsReceiver PROPERTIES target_link_libraries(slsReceiver slsReceiverShared pthread -# zmq + zmq rt ) @@ -105,7 +105,5 @@ install(TARGETS slsReceiverShared slsReceiverStatic slsReceiver PUBLIC_HEADER DESTINATION include) -#install(FILES ${ZMQ_STATIC_ARCHIVE} -#DESTINATION lib) -install(FILES -DESTINATION lib) \ No newline at end of file +install(FILES ${ZMQ_STATIC_ARCHIVE} +DESTINATION lib) \ No newline at end of file