Commit 0fcf8833 authored by Alejandro Homs Puron's avatar Alejandro Homs Puron Committed by Operator for ID00
Browse files

CMake: include slsDetectorPackage in compilation

parent ad4a6e52
......@@ -21,16 +21,15 @@
# You should have received a copy of the GNU General Public License
# along with this program; if not, see <http://www.gnu.org/licenses/>.
############################################################################
set(NAME "slsdetector")
set(NAME slsdetector)
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-error=format-security")
set(SLS_DETECTORS_DIR "${CMAKE_CURRENT_SOURCE_DIR}/slsDetectorPackage")
set(SLS_DETECTORS_BIN "${SLS_DETECTORS_DIR}/bin")
set(SLS_DETECTORS_SW "${SLS_DETECTORS_DIR}/slsDetectorSoftware")
set(SLS_DETECTORS_RECV "${SLS_DETECTORS_DIR}/slsReceiverSoftware")
add_subdirectory(slsDetectorPackage)
link_directories(${SLS_DETECTORS_BIN})
set(SLS_DETECTOR_DIR slsDetectorPackage)
set(SLS_DETECTOR_SW ${SLS_DETECTOR_DIR}/slsDetectorSoftware)
set(SLS_DETECTOR_RECV ${SLS_DETECTOR_DIR}/slsReceiverSoftware)
set(${NAME}_srcs src/SlsDetectorDefs.cpp src/SlsDetectorArgs.cpp
src/SlsDetectorCPUAffinity.cpp src/SlsDetectorModel.cpp
......@@ -40,29 +39,27 @@ set(${NAME}_srcs src/SlsDetectorDefs.cpp src/SlsDetectorArgs.cpp
add_library(lima${NAME} SHARED ${${NAME}_srcs})
target_include_directories(lima${NAME} PUBLIC
"${CMAKE_CURRENT_SOURCE_DIR}/include")
include
${SLS_DETECTOR_SW}/include
${SLS_DETECTOR_SW}/commonFiles
${SLS_DETECTOR_SW}/slsDetector
${SLS_DETECTOR_SW}/multiSlsDetector
${SLS_DETECTOR_SW}/slsDetectorServer
${SLS_DETECTOR_SW}/slsDetectorAnalysis
${SLS_DETECTOR_SW}/slsReceiverInterface
${SLS_DETECTOR_RECV}/include)
target_include_directories(lima${NAME} PUBLIC
"${SLS_DETECTORS_SW}/include"
"${SLS_DETECTORS_SW}/commonFiles"
"${SLS_DETECTORS_SW}/slsDetector"
"${SLS_DETECTORS_SW}/multiSlsDetector"
"${SLS_DETECTORS_SW}/slsDetectorServer"
"${SLS_DETECTORS_SW}/slsDetectorAnalysis"
"${SLS_DETECTORS_SW}/slsReceiverInterface"
"${SLS_DETECTORS_RECV}/include")
target_link_libraries(lima${NAME} limacore)
target_link_libraries(lima${NAME} SlsDetector)
target_link_libraries(lima${NAME} SlsReceiver)
target_link_libraries(lima${NAME}
limacore
slsDetectorShared slsReceiverShared)
limatools_set_library_soversion(lima${NAME} "VERSION")
limatools_set_library_soversion(lima${NAME} VERSION)
install(TARGETS lima${NAME} LIBRARY DESTINATION lib)
if(LIMA_ENABLE_PYTHON)
limatools_run_sip_for_camera(${NAME})
install(FILES python/__init__.py DESTINATION
"${PYTHON_SITE_PACKAGES_DIR}/Lima/SlsDetector")
${PYTHON_SITE_PACKAGES_DIR}/Lima/SlsDetector)
endif()
set(CMAKE_MODULE_PATH ${CMAKE_CURRENT_SOURCE_DIR}/cmake ${CMAKE_MODULE_PATH})
......
Subproject commit 130f319061561e8f7e1c465352e5d745d31846cd
Subproject commit 5302f71f4963121e41f3de8d3d7e8bf15569e269
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