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

fix

Browse Source
This commit is contained in:
Erik Frojdh 2020-09-04 11:20:33 +02:00
parent 514346c3ba
commit a1b88d3a62
2 changed files with 22 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
slsReceiverSoftware/CMakeLists.txt
View File

@ -34,10 +34,12 @@ if((CMAKE_BUILD_TYPE STREQUAL "Release") AND SLS_LTO_AVAILABLE)
set_property(TARGET slsReceiverShared PROPERTY INTERPROCEDURAL_OPTIMIZATION True) set_property(TARGET slsReceiverShared PROPERTY INTERPROCEDURAL_OPTIMIZATION True)
endif() endif()
target_link_libraries(slsReceiverShared PUBLIC target_link_libraries(slsReceiverShared
PUBLIC
slsProjectOptions slsProjectOptions
slsProjectWarnings slsSupportLibStatic
slsSupportLib PRIVATE
slsProjectWarnings #don't propagate warnigns
) )
target_include_directories(slsReceiverShared PUBLIC target_include_directories(slsReceiverShared PUBLIC

33
slsSupportLib/CMakeLists.txt
View File

@ -12,9 +12,6 @@ set(SOURCES
src/sls_detector_exceptions.cpp src/sls_detector_exceptions.cpp
) )
set(HEADERS
)
set(PUBLICHEADERS set(PUBLICHEADERS
include/sls_detector_defs.h include/sls_detector_defs.h
include/sls_detector_exceptions.h include/sls_detector_exceptions.h
@ -26,6 +23,10 @@ set(PUBLICHEADERS
include/TimeHelper.h include/TimeHelper.h
) )
# Additional headers to be installed if SLS_DEVEL_HEADERS
# is specified as an option. Aim is to give the developer
# access to utilities in the support library while
# at the same time offer a minimal install
if(SLS_DEVEL_HEADERS) if(SLS_DEVEL_HEADERS)
set(PUBLICHEADERS set(PUBLICHEADERS
${PUBLICHEADERS} ${PUBLICHEADERS}
@ -44,15 +45,12 @@ if(SLS_DEVEL_HEADERS)
) )
endif() endif()
# Create a Object library to avoid duplicating the build # Create a Object library to avoidbuilding the library twice
add_library(slsSupportObject OBJECT add_library(slsSupportObject OBJECT
${SOURCES} ${SOURCES}
${HEADERS} ${HEADERS}
) )
target_include_directories(slsSupportObject PUBLIC target_include_directories(slsSupportObject PUBLIC
"$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/include>" "$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/include>"
"$<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}>" "$<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}>"
@ -77,11 +75,11 @@ if (SLS_USE_TESTS)
endif(SLS_USE_TESTS) endif(SLS_USE_TESTS)
add_library(slsSupportLib SHARED $<TARGET_OBJECTS:slsSupportObject>) add_library(slsSupportLib SHARED $<TARGET_OBJECTS:slsSupportObject>)
target_link_libraries(slsSupportLib PUBLIC slsSupportObject)
target_include_directories(slsSupportLib PUBLIC # target_include_directories(slsSupportLib PUBLIC
"$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/include>" # "$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/include>"
"$<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}>" # "$<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}>"
) # )
set_target_properties(slsSupportLib PROPERTIES set_target_properties(slsSupportLib PROPERTIES
LIBRARY_OUTPUT_NAME SlsSupport LIBRARY_OUTPUT_NAME SlsSupport
@ -90,6 +88,7 @@ set_target_properties(slsSupportLib PROPERTIES
) )
add_library(slsSupportLibStatic STATIC $<TARGET_OBJECTS:slsSupportObject>) add_library(slsSupportLibStatic STATIC $<TARGET_OBJECTS:slsSupportObject>)
target_link_libraries(slsSupportLibStatic PUBLIC slsSupportObject)
set_target_properties(slsSupportLibStatic PROPERTIES set_target_properties(slsSupportLibStatic PROPERTIES
ARCHIVE_OUTPUT_NAME SlsSupportStatic ARCHIVE_OUTPUT_NAME SlsSupportStatic
@ -97,10 +96,10 @@ set_target_properties(slsSupportLibStatic PROPERTIES
PUBLIC_HEADER "${PUBLICHEADERS}" PUBLIC_HEADER "${PUBLICHEADERS}"
) )
target_include_directories(slsSupportLibStatic PUBLIC # target_include_directories(slsSupportLibStatic PUBLIC
"$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/include>" # "$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/include>"
"$<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}>" # "$<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}>"
) # )
if((CMAKE_BUILD_TYPE STREQUAL "Release") AND SLS_LTO_AVAILABLE) if((CMAKE_BUILD_TYPE STREQUAL "Release") AND SLS_LTO_AVAILABLE)
set_property(TARGET slsSupportObject PROPERTY INTERPROCEDURAL_OPTIMIZATION True) set_property(TARGET slsSupportObject PROPERTY INTERPROCEDURAL_OPTIMIZATION True)
@ -109,7 +108,7 @@ if((CMAKE_BUILD_TYPE STREQUAL "Release") AND SLS_LTO_AVAILABLE)
endif() endif()
# Install the library # Install the library
install(TARGETS slsSupportLib slsSupportLibStatic install(TARGETS slsSupportLib slsSupportLibStatic slsSupportObject
EXPORT "${TARGETS_EXPORT_NAME}" EXPORT "${TARGETS_EXPORT_NAME}"
LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR} ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}