From e13ecc8625332a0ec8ccf63198659f7c7a126411 Mon Sep 17 00:00:00 2001 From: Samuel Debionne Date: Fri, 7 Sep 2018 10:55:03 +0200 Subject: [PATCH] Add slsReceiver and slsDetector targets to the export set (used by donwstream project) set TARGETS_EXPORT_NAME if the project is built directly. --- CMakeLists.txt | 10 ++++++++++ slsDetectorSoftware/CMakeLists.txt | 1 + slsReceiverSoftware/CMakeLists.txt | 6 +++--- 3 files changed, 14 insertions(+), 3 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index e4f3e4f8f..f21c7f0c7 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -2,6 +2,12 @@ cmake_minimum_required(VERSION 2.8) set(CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/cmake" ${CMAKE_MODULE_PATH}) set (CALIBRATE OFF) +# Check if project is being used directly or via add_subdirectory +set(SLS_MASTER_PROJECT OFF) +if (CMAKE_CURRENT_SOURCE_DIR STREQUAL CMAKE_SOURCE_DIR) + set(SLS_MASTER_PROJECT ON) +endif() + option (USE_HDF5 "HDF5 File format" OFF) option (USE_TEXTCLIENT "Text Client" OFF) option (USE_RECEIVER "Receiver" OFF) @@ -46,6 +52,10 @@ if (USE_GUI) endif() endif (USE_GUI) +if (SLS_MASTER_PROJECT) + # Set targets export name (otherwise set by upstream project) + set(TARGETS_EXPORT_NAME "slsdetector-targets") +endif (SLS_MASTER_PROJECT) if (CALIBRATE) if (DEFINED ENV{ROOTSYS}) diff --git a/slsDetectorSoftware/CMakeLists.txt b/slsDetectorSoftware/CMakeLists.txt index 8350492a5..55aca177f 100644 --- a/slsDetectorSoftware/CMakeLists.txt +++ b/slsDetectorSoftware/CMakeLists.txt @@ -90,6 +90,7 @@ if(DOXYGEN_FOUND) endif() install(TARGETS slsDetectorShared + EXPORT "${TARGETS_EXPORT_NAME}" LIBRARY DESTINATION lib PUBLIC_HEADER DESTINATION include ARCHIVE DESTINATION lib) diff --git a/slsReceiverSoftware/CMakeLists.txt b/slsReceiverSoftware/CMakeLists.txt index 02ec37d05..4fb691c21 100644 --- a/slsReceiverSoftware/CMakeLists.txt +++ b/slsReceiverSoftware/CMakeLists.txt @@ -90,11 +90,11 @@ endif () install(TARGETS slsReceiverShared slsReceiver + EXPORT "${TARGETS_EXPORT_NAME}" RUNTIME DESTINATION bin LIBRARY DESTINATION lib ARCHIVE DESTINATION lib PUBLIC_HEADER DESTINATION include) - - + install(FILES ${ZMQ_STATIC_ARCHIVE} -DESTINATION lib) \ No newline at end of file +DESTINATION lib)