Better control of what is built (#247)

* allow for build only detector libs

* allow receiver libs only

* option for shared libraries

CMakeLists.txt

@@ -33,8 +33,11 @@ if (CMAKE_CURRENT_SOURCE_DIR STREQUAL CMAKE_SOURCE_DIR)
 endif()
 
 option(SLS_USE_HDF5 "HDF5 File format" OFF)
+option(SLS_BUILD_SHARED_LIBRARIES "Build shared libaries" ON)
 option(SLS_USE_TEXTCLIENT "Text Client" ON)
+option(SLS_USE_DETECTOR "Detector libs" ON)
 option(SLS_USE_RECEIVER "Receiver" ON)
+option(SLS_USE_RECEIVER_BINARIES "Receiver binaries" ON)
 option(SLS_USE_GUI "GUI" OFF)
 option(SLS_USE_SIMULATOR "Simulator" OFF)
 option(SLS_USE_TESTS "TESTS" OFF)
@@ -200,9 +203,9 @@ endif(SLS_USE_TESTS)
 # Common functionallity to detector and receiver
 add_subdirectory(slsSupportLib)
 
-if (SLS_USE_TEXTCLIENT)
+if (SLS_USE_DETECTOR OR SLS_USE_TEXTCLIENT)
     add_subdirectory(slsDetectorSoftware)
-endif (SLS_USE_TEXTCLIENT)
+endif ()
 
 if (SLS_USE_RECEIVER)
     add_subdirectory(slsReceiverSoftware) 

slsDetectorSoftware/CMakeLists.txt

@@ -26,6 +26,8 @@ target_link_libraries(slsDetectorObject
         slsProjectWarnings
 )
 
+set(DETECTOR_LIBRARY_TARGETS slsDetectorObject)
+
 
 set(PUBLICHEADERS
     include/sls/detectorData.h
@@ -35,6 +37,7 @@ set(PUBLICHEADERS
 )
 
 #Shared library
+if(SLS_BUILD_SHARED_LIBRARIES)
     add_library(slsDetectorShared SHARED $<TARGET_OBJECTS:slsDetectorObject>)
     target_link_libraries(slsDetectorShared PUBLIC slsDetectorObject)
     set_target_properties(slsDetectorShared PROPERTIES
@@ -42,6 +45,8 @@ set_target_properties(slsDetectorShared PROPERTIES
         LIBRARY_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/bin
         PUBLIC_HEADER "${PUBLICHEADERS}"
     )
+    list(APPEND DETECTOR_LIBRARY_TARGETS slsDetectorShared)
+endif(SLS_BUILD_SHARED_LIBRARIES)
 
 #Static library
 add_library(slsDetectorStatic STATIC $<TARGET_OBJECTS:slsDetectorObject>)
@@ -52,15 +57,21 @@ set_target_properties(slsDetectorStatic PROPERTIES
     ARCHIVE_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/bin
     PUBLIC_HEADER "${PUBLICHEADERS}"
 )
+list(APPEND DETECTOR_LIBRARY_TARGETS slsDetectorStatic)
+
+    
+
 
 
-# message("Detector LTO_AVAILABLE:" ${SLS_LTO_AVAILABLE})
 if((CMAKE_BUILD_TYPE STREQUAL "Release") AND SLS_LTO_AVAILABLE)
-    set_property(TARGET slsDetectorObject PROPERTY INTERPROCEDURAL_OPTIMIZATION True)
-    set_property(TARGET slsDetectorStatic PROPERTY INTERPROCEDURAL_OPTIMIZATION True)
-    set_property(TARGET slsDetectorShared PROPERTY INTERPROCEDURAL_OPTIMIZATION True)
+    set_property(TARGET ${DETECTOR_LIBRARY_TARGETS} PROPERTY INTERPROCEDURAL_OPTIMIZATION True)
+    # set_property(TARGET slsDetectorObject PROPERTY INTERPROCEDURAL_OPTIMIZATION True)
+    # set_property(TARGET slsDetectorStatic PROPERTY INTERPROCEDURAL_OPTIMIZATION True)
+    # set_property(TARGET slsDetectorShared PROPERTY INTERPROCEDURAL_OPTIMIZATION True)
 endif()
 
+
+if(SLS_USE_TEXTCLIENT)
     # Loop over list to generate command line binaries
     set(bin_names "sls_detector_put" 
             "sls_detector_get" 
@@ -89,17 +100,16 @@ foreach(val RANGE ${len2})
             set_property(TARGET ${val1} PROPERTY INTERPROCEDURAL_OPTIMIZATION True)
         endif()
     endforeach()
-
-
     install(TARGETS ${bin_names} DESTINATION bin)
 
+endif(SLS_USE_TEXTCLIENT)
 
 if (SLS_USE_TESTS)
     add_subdirectory(tests)
 endif(SLS_USE_TESTS)
 
 
-install(TARGETS slsDetectorShared slsDetectorObject slsDetectorStatic
+install(TARGETS ${DETECTOR_LIBRARY_TARGETS}
     EXPORT "${TARGETS_EXPORT_NAME}"
     RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}
     LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}

slsReceiverSoftware/CMakeLists.txt

@@ -56,8 +56,10 @@ if (SLS_USE_HDF5)
     endif ()
 endif (SLS_USE_HDF5)
 
+set(RECEIVER_LIBRARY_TARGETS slsReceiverObject)
 
 #Shared library
+if(SLS_BUILD_SHARED_LIBRARIES)
     add_library(slsReceiverShared SHARED $<TARGET_OBJECTS:slsReceiverObject>)
     target_link_libraries(slsReceiverShared PUBLIC slsReceiverObject)
     set_target_properties(slsReceiverShared PROPERTIES
@@ -65,6 +67,8 @@ set_target_properties(slsReceiverShared PROPERTIES
         LIBRARY_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/bin
         PUBLIC_HEADER "${PUBLICHEADERS}"
     )
+    list(APPEND RECEIVER_LIBRARY_TARGETS slsReceiverShared)
+endif(SLS_BUILD_SHARED_LIBRARIES)
 
 #Static library 
 add_library(slsReceiverStatic STATIC $<TARGET_OBJECTS:slsReceiverObject>)
@@ -74,20 +78,22 @@ set_target_properties(slsReceiverStatic PROPERTIES
     ARCHIVE_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/bin
     PUBLIC_HEADER "${PUBLICHEADERS}"
 )
+list(APPEND RECEIVER_LIBRARY_TARGETS slsReceiverStatic)
+
 
-# message("Receiver LTO_AVAILABLE:" ${SLS_LTO_AVAILABLE})
 if((CMAKE_BUILD_TYPE STREQUAL "Release") AND SLS_LTO_AVAILABLE)
-    set_property(TARGET slsReceiverObject PROPERTY INTERPROCEDURAL_OPTIMIZATION True)
-    set_property(TARGET slsReceiverStatic PROPERTY INTERPROCEDURAL_OPTIMIZATION True)
-    set_property(TARGET slsReceiverShared PROPERTY INTERPROCEDURAL_OPTIMIZATION True)
+    set_property(TARGET ${RECEIVER_LIBRARY_TARGETS} PROPERTY INTERPROCEDURAL_OPTIMIZATION True)
 endif()
 
 
+
+# Receiver binaries 
+
+if (SLS_USE_RECEIVER_BINARIES)
     add_executable(slsReceiver
         src/ReceiverApp.cpp
     )
 
-
     set_target_properties(slsReceiver PROPERTIES
         RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/bin
     )
@@ -108,7 +114,6 @@ add_executable(slsMultiReceiver
         src/MultiReceiverApp.cpp
     )
 
-
     set_target_properties(slsMultiReceiver PROPERTIES
         RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/bin
     )
@@ -125,12 +130,22 @@ target_link_libraries(slsMultiReceiver
         slsProjectWarnings
     )
 
-if (SLS_USE_TESTS)
-    add_subdirectory(tests)
-endif(SLS_USE_TESTS)
-
-
-install(TARGETS slsReceiverShared slsReceiver slsMultiReceiver slsReceiverObject slsReceiverStatic
+    install(TARGETS slsReceiver slsMultiReceiver
+        EXPORT "${TARGETS_EXPORT_NAME}"
+        RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}
+        LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
+        ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}
+        PUBLIC_HEADER DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/sls
+)
+
+endif(SLS_USE_RECEIVER_BINARIES)
+
+if (SLS_USE_TESTS)
+    add_subdirectory(tests)
+endif(SLS_USE_TESTS)
+
+
+install(TARGETS ${RECEIVER_LIBRARY_TARGETS}
         EXPORT "${TARGETS_EXPORT_NAME}"
         RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}
         LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}

slsSupportLib/CMakeLists.txt

@@ -72,7 +72,11 @@ if (SLS_USE_TESTS)
     add_subdirectory(tests)
 endif(SLS_USE_TESTS)
 
+#List of targets to support adding removing targets as config
+set(SUPPORT_LIBRARY_TARGETS slsSupportObject)
+
 # Add shared library version of the support lib
+if(SLS_BUILD_SHARED_LIBRARIES)
     add_library(slsSupportShared SHARED $<TARGET_OBJECTS:slsSupportObject>)
     target_link_libraries(slsSupportShared PUBLIC slsSupportObject)
 
@@ -81,6 +85,8 @@ set_target_properties(slsSupportShared PROPERTIES
         LIBRARY_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/bin
         PUBLIC_HEADER "${PUBLICHEADERS}"
     )
+    list(APPEND SUPPORT_LIBRARY_TARGETS slsSupportShared)
+endif(SLS_BUILD_SHARED_LIBRARIES)
 
 # Add static version of the support lib
 add_library(slsSupportStatic STATIC $<TARGET_OBJECTS:slsSupportObject>)
@@ -91,14 +97,13 @@ set_target_properties(slsSupportStatic PROPERTIES
     ARCHIVE_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/bin
     PUBLIC_HEADER "${PUBLICHEADERS}"
 )
+list(APPEND SUPPORT_LIBRARY_TARGETS slsSupportStatic)
 
 if((CMAKE_BUILD_TYPE STREQUAL "Release") AND SLS_LTO_AVAILABLE)
-    set_property(TARGET slsSupportObject PROPERTY INTERPROCEDURAL_OPTIMIZATION True)
-    set_property(TARGET slsSupportShared  PROPERTY INTERPROCEDURAL_OPTIMIZATION True)
-    set_property(TARGET slsSupportStatic PROPERTY INTERPROCEDURAL_OPTIMIZATION True)
+    set_property(TARGET ${SUPPORT_LIBRARY_TARGETS} PROPERTY INTERPROCEDURAL_OPTIMIZATION True)
 endif()
 
-install(TARGETS slsSupportShared slsSupportStatic slsSupportObject
+install(TARGETS ${SUPPORT_LIBRARY_TARGETS}
     EXPORT "${TARGETS_EXPORT_NAME}"
     LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
     ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}

tests/CMakeLists.txt

@@ -28,11 +28,11 @@ target_link_libraries(tests
       slsProjectWarnings
 )  
 
-if (SLS_USE_TEXTCLIENT)
+if (SLS_USE_DETECTOR)
     target_link_libraries(tests PUBLIC
         slsDetectorShared
     )
-endif (SLS_USE_TEXTCLIENT)
+endif (SLS_USE_DETECTOR)
 
 if (SLS_USE_RECEIVER)
     target_link_libraries(tests PUBLIC