From 2dd809390519a49862ebebc64314ff4a6e536aa2 Mon Sep 17 00:00:00 2001 From: Erik Frojdh Date: Mon, 17 Dec 2018 14:55:19 +0100 Subject: [PATCH] added project to CMakeLists and path for installing --- CMakeLists.txt | 3 +++ slsDetectorSoftware/CMakeLists.txt | 18 ++++++++++-------- 2 files changed, 13 insertions(+), 8 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 5e9ef97eb..772a0ba6a 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,4 +1,7 @@ cmake_minimum_required(VERSION 2.8) + +project(slsDetectorPackage LANGUAGES CXX) + set(CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/cmake" ${CMAKE_MODULE_PATH}) set (CALIBRATE OFF) diff --git a/slsDetectorSoftware/CMakeLists.txt b/slsDetectorSoftware/CMakeLists.txt index 186f0828c..d3c2ca86e 100644 --- a/slsDetectorSoftware/CMakeLists.txt +++ b/slsDetectorSoftware/CMakeLists.txt @@ -36,20 +36,22 @@ target_link_libraries(slsDetectorShared zmq ) + + set(PUBLICHEADERS - ../slsSupportLib/include/sls_detector_defs.h - ../slsSupportLib/include/sls_detector_funcs.h - ../slsSupportLib/include/error_defs.h - ../slsSupportLib/include/versionAPI.h - ../slsSupportLib/include/sls_detector_exceptions.h - ../slsSupportLib/include/utilties.h - ../slsSupportLib/include/container_utils.h + ${PROJECT_SOURCE_DIR}/slsSupportLib/include/sls_detector_defs.h + ${PROJECT_SOURCE_DIR}/slsSupportLib/include/sls_detector_funcs.h + ${PROJECT_SOURCE_DIR}/slsSupportLib/include/error_defs.h + ${PROJECT_SOURCE_DIR}/slsSupportLib/include/versionAPI.h + ${PROJECT_SOURCE_DIR}/slsSupportLib/include/sls_detector_exceptions.h + ${PROJECT_SOURCE_DIR}/slsSupportLib/include/utilities.h + ${PROJECT_SOURCE_DIR}/slsSupportLib/include/container_utils.h sharedMemory/SharedMemory.h slsDetector/slsDetector.h slsDetector/slsDetectorUsers.h slsDetector/detectorData.h multiSlsDetector/multiSlsDetector.h - ../slsSupportLib/include/ClientInterface.h + ${PROJECT_SOURCE_DIR}/slsSupportLib/include/ClientInterface.h ) set_target_properties(slsDetectorShared PROPERTIES LIBRARY_OUTPUT_NAME SlsDetector