From 73ae8c61511726ee4a7065b6b0f6e15b0b95d29f Mon Sep 17 00:00:00 2001 From: Erik Frojdh Date: Tue, 15 Jan 2019 17:24:20 +0100 Subject: [PATCH] removing static libs --- slsDetectorSoftware/CMakeLists.txt | 11 +---------- slsReceiverSoftware/CMakeLists.txt | 11 +---------- 2 files changed, 2 insertions(+), 20 deletions(-) diff --git a/slsDetectorSoftware/CMakeLists.txt b/slsDetectorSoftware/CMakeLists.txt index 67d0416aa..8350492a5 100644 --- a/slsDetectorSoftware/CMakeLists.txt +++ b/slsDetectorSoftware/CMakeLists.txt @@ -41,15 +41,6 @@ add_definitions( -DDACS_INT ) -add_library(slsDetectorStatic STATIC - ${SOURCES} - ${HEADERS} -) -set_target_properties(slsDetectorStatic PROPERTIES - ARCHIVE_OUTPUT_NAME SlsDetector - ARCHIVE_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/bin -) - add_library(slsDetectorShared SHARED ${SOURCES} ${HEADERS} @@ -98,7 +89,7 @@ if(DOXYGEN_FOUND) ) endif() -install(TARGETS slsDetectorShared slsDetectorStatic +install(TARGETS slsDetectorShared LIBRARY DESTINATION lib PUBLIC_HEADER DESTINATION include ARCHIVE DESTINATION lib) diff --git a/slsReceiverSoftware/CMakeLists.txt b/slsReceiverSoftware/CMakeLists.txt index 7fdc5d042..02ec37d05 100644 --- a/slsReceiverSoftware/CMakeLists.txt +++ b/slsReceiverSoftware/CMakeLists.txt @@ -48,15 +48,6 @@ set_target_properties(zmq PROPERTIES IMPORTED_LOCATION ${ZMQ_STATIC_ARCHIVE} ) -add_library(slsReceiverStatic STATIC - ${SOURCES} - ${HEADERS} -) -set_target_properties(slsReceiverStatic PROPERTIES - ARCHIVE_OUTPUT_NAME SlsReceiver - ARCHIVE_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/bin -) - add_library(slsReceiverShared SHARED ${SOURCES} ${HEADERS} @@ -98,7 +89,7 @@ endif () -install(TARGETS slsReceiverShared slsReceiverStatic slsReceiver +install(TARGETS slsReceiverShared slsReceiver RUNTIME DESTINATION bin LIBRARY DESTINATION lib ARCHIVE DESTINATION lib