detectors/slsDetectorPackage
25
0
Fork 0
mirror of https://github.com/slsdetectorgroup/slsDetectorPackage.git synced 2025-04-26 16:20:03 +02:00
Code Issues Actions Packages Releases Activity

esrf changes: CMake: support to be added and installed as a sub-project:

Browse Source 
* Configure zmq as global imported library in slsReceiverSoftware
* Install zmq, necessary if linking to slsReceiver library
This commit is contained in:
maliakal_d 2018-04-25 18:24:08 +02:00
parent 1247f760f2
commit 16428f3828
4 changed files with 9 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
CMakeLists.txt
View File

@ -1,5 +1,5 @@
cmake_minimum_required(VERSION 2.8) cmake_minimum_required(VERSION 2.8)
set(CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}/cmake") set(CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/cmake" ${CMAKE_MODULE_PATH})
set (CALIBRATE OFF) set (CALIBRATE OFF)
option (USE_HDF5 "HDF5 File format" OFF) option (USE_HDF5 "HDF5 File format" OFF)

5
slsDetectorGui/CMakeLists.txt
View File

@ -105,11 +105,6 @@ set_target_properties(slsDetectorGui PROPERTIES
RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/bin RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/bin
) )
add_library(zmq STATIC IMPORTED )
set_target_properties(zmq PROPERTIES
IMPORTED_LOCATION ${CMAKE_CURRENT_SOURCE_DIR}/../slsReceiverSoftware/include/libzmq.a
)
target_link_libraries(slsDetectorGui target_link_libraries(slsDetectorGui
slsDetectorShared slsDetectorShared

6
slsDetectorSoftware/CMakeLists.txt
View File

@ -39,12 +39,6 @@ add_definitions(
-DDACS_INT -DDACS_INT
) )
add_library(zmq STATIC IMPORTED )
set_target_properties(zmq PROPERTIES
IMPORTED_LOCATION ${CMAKE_CURRENT_SOURCE_DIR}/../slsReceiverSoftware/include/libzmq.a
)
add_library(slsDetectorStatic STATIC add_library(slsDetectorStatic STATIC
${SOURCES} ${SOURCES}
${HEADERS} ${HEADERS}

11
slsReceiverSoftware/CMakeLists.txt
View File

@ -42,10 +42,11 @@ include_directories(
include include
) )
add_library(zmq STATIC IMPORTED ) add_library(zmq STATIC IMPORTED GLOBAL)
set(ZMQ_STATIC_ARCHIVE ${CMAKE_CURRENT_SOURCE_DIR}/include/libzmq.a)
set_target_properties(zmq PROPERTIES set_target_properties(zmq PROPERTIES
IMPORTED_LOCATION ${CMAKE_CURRENT_SOURCE_DIR}/include/libzmq.a IMPORTED_LOCATION ${ZMQ_STATIC_ARCHIVE}
) )
add_library(slsReceiverStatic STATIC add_library(slsReceiverStatic STATIC
@ -101,4 +102,8 @@ install(TARGETS slsReceiverShared slsReceiverStatic slsReceiver
RUNTIME DESTINATION bin RUNTIME DESTINATION bin
LIBRARY DESTINATION lib LIBRARY DESTINATION lib
ARCHIVE DESTINATION lib ARCHIVE DESTINATION lib
PUBLIC_HEADER DESTINATION include) PUBLIC_HEADER DESTINATION include)
install(FILES ${ZMQ_STATIC_ARCHIVE}
DESTINATION lib)