Commit b0297e38 authored by Alejandro Homs Puron's avatar Alejandro Homs Puron Committed by operator for beamline
Browse files

CMake: complete slsDetectorPackage build and installation, including zmq

parent dbc0f24f
......@@ -25,12 +25,12 @@ set(NAME slsdetector)
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-error=format-security")
add_subdirectory(slsDetectorPackage)
set(SLS_DETECTOR_DIR slsDetectorPackage)
set(SLS_DETECTOR_SW ${SLS_DETECTOR_DIR}/slsDetectorSoftware)
set(SLS_DETECTOR_RECV ${SLS_DETECTOR_DIR}/slsReceiverSoftware)
add_subdirectory(${SLS_DETECTOR_DIR})
set(${NAME}_srcs src/SlsDetectorDefs.cpp src/SlsDetectorArgs.cpp
src/SlsDetectorCPUAffinity.cpp src/SlsDetectorModel.cpp
src/SlsDetectorCamera.cpp src/SlsDetectorEiger.cpp
......@@ -51,7 +51,7 @@ target_include_directories(lima${NAME} PUBLIC
target_link_libraries(lima${NAME}
limacore
slsDetectorShared slsReceiverShared)
slsDetectorShared slsReceiverShared zmq)
limatools_set_library_soversion(lima${NAME} VERSION)
install(TARGETS lima${NAME} LIBRARY DESTINATION lib)
......
Subproject commit 5302f71f4963121e41f3de8d3d7e8bf15569e269
Subproject commit 572aabdbd9c4c7dbca7d3a9e800f1338a454244b
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment