detectors/slsDetectorPackage
25
0
Fork 0
mirror of https://github.com/slsdetectorgroup/slsDetectorPackage.git synced 2025-06-23 18:17:59 +02:00
Code Issues Actions Packages Releases Activity

removing static libs and changing flags

Browse Source
This commit is contained in:
Erik Frojdh
2019-01-15 16:56:33 +01:00
parent 8bc9fa54fc
commit 7303734b19
3 changed files with 24 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
slsDetectorSoftware/CMakeLists.txt
View File

@ -4,28 +4,19 @@ set(SOURCES
slsDetector/slsDetectorUsers.cpp
slsDetector/slsDetectorCommand.cpp
slsDetector/slsDetector.cpp
../slsSupportLib/include/ClientInterface.cpp
../slsSupportLib/include/utilities.cpp
../slsSupportLib/src/string_utils.cpp
${PROJECT_SOURCE_DIR}/slsSupportLib/include/ClientInterface.cpp
${PROJECT_SOURCE_DIR}/slsSupportLib/include/utilities.cpp
${PROJECT_SOURCE_DIR}/slsSupportLib/src/string_utils.cpp
)
set(HEADERS
)
include_directories(
../slsSupportLib/include
multiSlsDetector
sharedMemory
slsDetector
)
add_library(slsDetectorStatic STATIC
${SOURCES}
${HEADERS}
)
set_target_properties(slsDetectorStatic PROPERTIES
ARCHIVE_OUTPUT_NAME SlsDetector
ARCHIVE_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/bin
${PROJECT_SOURCE_DIR}/slsSupportLib/include
multiSlsDetector
sharedMemory
slsDetector
)
add_library(slsDetectorShared SHARED
@ -38,7 +29,6 @@ target_link_libraries(slsDetectorShared
)
set(PUBLICHEADERS
${PROJECT_SOURCE_DIR}/slsSupportLib/include/sls_detector_defs.h
${PROJECT_SOURCE_DIR}/slsSupportLib/include/sls_detector_funcs.h
@ -61,8 +51,6 @@ set_target_properties(slsDetectorShared PROPERTIES
PUBLIC_HEADER "${PUBLICHEADERS}"
)
add_subdirectory(slsDetectorClient)
if(DOXYGEN_FOUND)
@ -75,7 +63,8 @@ if(DOXYGEN_FOUND)
endif()
install(TARGETS slsDetectorShared slsDetectorStatic
install(TARGETS slsDetectorShared
LIBRARY DESTINATION lib
PUBLIC_HEADER DESTINATION include
ARCHIVE DESTINATION lib)
ARCHIVE DESTINATION lib
)