build(cmake): install as single package

Author: plexoos

CMakeLists.txt

@@ -1,13 +1,18 @@
 cmake_minimum_required(VERSION 3.18)
 
-list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/cmake/Modules")
+list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/cmake")
 
 if(NOT DEFINED CMAKE_CUDA_ARCHITECTURES)
     set(CMAKE_CUDA_ARCHITECTURES 75)
 endif()
 
 project(eic-opticks VERSION 0.1.0 LANGUAGES CXX CUDA)
 
+set(BUILD_SHARED_LIBS ON)
+
+include(GNUInstallDirs)
+include(CTest)
+
 add_subdirectory(sysrap)
 add_subdirectory(CSG)
 add_subdirectory(qudarap)

CSG/CMakeLists.txt

@@ -1,10 +1,4 @@
 set(name CSG)
-project(${name} VERSION 0.1.0)
-include(OpticksBuildOptions NO_POLICY_SCOPE)
-
-include_directories(
-    ${CMAKE_CURRENT_SOURCE_DIR} 
-)
 
 set(SOURCES)
 set(HEADERS)
@@ -119,16 +113,19 @@ target_compile_definitions( ${name} PUBLIC OPTICKS_CSG )
 target_compile_definitions( ${name} PUBLIC WITH_CONTIGUOUS )
 target_compile_definitions( ${name} PUBLIC WITH_S_BB )
 
-target_include_directories(${name}
-     PUBLIC
-           $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}>
-           $<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}>
+target_include_directories(${name} PUBLIC
+    $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}>
+    $<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}>
 )
 
-target_link_libraries(${name} Opticks::SysRap)
+target_link_libraries(${name} SysRap)
 
-bcm_deploy(TARGETS ${name} NAMESPACE Opticks:: SKIP_HEADER_INSTALL)
+install(FILES ${HEADERS} DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/${name})
 
-install(FILES ${HEADERS}  DESTINATION ${CMAKE_INSTALL_INCLUDEDIR})
+install(TARGETS ${name}
+        EXPORT EicOpticksTargets
+        LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
+        ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}
+)
 
 add_subdirectory(tests)

CSG/tests/CMakeLists.txt

@@ -66,7 +66,7 @@ set( DEFERRED_TEST_SOURCES
 foreach(SRC ${TEST_SOURCES})
     get_filename_component(TGT ${SRC} NAME_WE)
     add_executable(${TGT} ${SRC})
-    target_link_libraries(${TGT} Opticks::CSG CUDA::cudart)
+    target_link_libraries(${TGT} CSG CUDA::cudart)
 
     add_test(
        NAME ${name}.${TGT} 
@@ -76,4 +76,4 @@ endforeach()
 
 set(TGT CSGDemoTest)
 add_executable(${TGT} CSGDemoTest.cc DemoGeo.cc DemoGrid.cc)
-target_link_libraries(${TGT} Opticks::CSG CUDA::cudart)
+target_link_libraries(${TGT} CSG CUDA::cudart)

CSGOptiX/CMakeLists.txt

@@ -1,21 +1,11 @@
 set(name CSGOptiX)
-project(${name} VERSION 0.1.0)
-include(OpticksBuildOptions)
 
 find_package(OptiX)
 
-get_target_property(CSG_INCLUDE_DIRS Opticks::CSG INTERFACE_INCLUDE_DIRECTORIES)
 set(buildenvpath ${CMAKE_CURRENT_BINARY_DIR}/buildenv.sh)
 file(WRITE ${buildenvpath} "export OPTIX_VERSION=${OptiX_VERSION}\n")
 message(STATUS "write to buildenvpath ${buildenvpath} ")
 
-
-include_directories(
-    ${CSG_INCLUDE_DIRS}
-    ${CMAKE_CURRENT_SOURCE_DIR} 
-)
-
-
 set(SOURCES)
 set(CU_SOURCES)
 
@@ -58,6 +48,7 @@ foreach(cu_src IN LISTS CU_SOURCES)
     add_library(${cu_src} OBJECT ${cu_src})
     set_target_properties(${cu_src} PROPERTIES CUDA_PTX_COMPILATION ON)
     target_include_directories(${cu_src} PUBLIC
+            $<BUILD_INTERFACE:${CMAKE_SOURCE_DIR}/CSG>
             $<BUILD_INTERFACE:${CMAKE_SOURCE_DIR}/sysrap>
             $<BUILD_INTERFACE:${CMAKE_SOURCE_DIR}/qudarap>)
     target_compile_definitions(${cu_src} PUBLIC WITH_PRD WITH_SIMULATE WITH_SIMTRACE WITH_RENDER
@@ -94,23 +85,19 @@ WITH_THRUST compile definition
 target_compile_definitions( ${name} PRIVATE WITH_THRUST )
 
 target_include_directories( ${name} PUBLIC
-    $<BUILD_INTERFACE:${CMAKE_BINARY_DIR}/sysrap/inc>
-    $<INSTALL_INTERFACE:include>
-    $<INSTALL_INTERFACE:include/CSGOptiX>
+    $<BUILD_INTERFACE:${CMAKE_SOURCE_DIR}/CSGOptiX>
+    $<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}>
 )
 
-target_link_libraries(${name} 
-     PUBLIC 
-         OptiX::OptiX
-         Opticks::CSG
-         Opticks::QUDARap
-)
-
-# Opticks::OpticksCore
+target_link_libraries(${name} PUBLIC OptiX::OptiX CSG QUDARap SysRap)
 
 install(FILES $<TARGET_OBJECTS:CSGOptiX7.cu> DESTINATION ptx RENAME CSGOptiX_generated_CSGOptiX7.cu.ptx)
-install(FILES ${HEADERS}  DESTINATION ${CMAKE_INSTALL_INCLUDEDIR})
+install(FILES ${HEADERS} DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/${name})
 
-add_subdirectory(tests)
+install(TARGETS ${name}
+        EXPORT EicOpticksTargets
+        LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
+        ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}
+)
 
-bcm_deploy(TARGETS ${name} NAMESPACE Opticks:: SKIP_HEADER_INSTALL)
+add_subdirectory(tests)

g4cx/CMakeLists.txt

@@ -1,7 +1,4 @@
 set(name G4CX)
-set(desc "Top Level")
-project(${name} VERSION 0.1.0)
-include(OpticksBuildOptions NO_POLICY_SCOPE)
 
 set(SOURCES
     G4CX_LOG.cc 
@@ -14,23 +11,23 @@ set(HEADERS
     G4CXOpticks.hh
 )
 
+add_library(${name} SHARED ${SOURCES} ${HEADERS})
 
-add_library( ${name}  SHARED ${SOURCES} ${HEADERS} )
-
-target_link_libraries( ${name} PUBLIC
-    Opticks::U4
-    Opticks::CSGOptiX
-)
+target_link_libraries(${name} PUBLIC U4 CSGOptiX)
 
 target_include_directories( ${name} PUBLIC 
    $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}> 
    $<BUILD_INTERFACE:${CMAKE_SOURCE_DIR}/CSGOptiX>
 )
 
 target_compile_definitions( ${name} PUBLIC OPTICKS_G4CX )
-target_compile_definitions( ${name} PUBLIC G4USE_STD11 ) 
 
-install(FILES ${HEADERS}  DESTINATION ${CMAKE_INSTALL_INCLUDEDIR})
-bcm_deploy(TARGETS ${name} NAMESPACE Opticks:: SKIP_HEADER_INSTALL)
+install(FILES ${HEADERS} DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/${name})
+
+install(TARGETS ${name}
+        EXPORT EicOpticksTargets
+        LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
+        ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}
+)
 
 add_subdirectory(tests)

g4cx/tests/CMakeLists.txt

@@ -1,6 +1,4 @@
 set(name G4CXTest)
-project(${name} VERSION 0.1.0)
-include(OpticksBuildOptions)   
 
 find_package(CUDAToolkit REQUIRED)
 

gdxml/CMakeLists.txt

@@ -1,7 +1,5 @@
 set(name GDXML)
 set(desc "XML Level xercesc fixing GDML")
-project(${name} VERSION 0.1.0)
-include(OpticksBuildOptions NO_POLICY_SCOPE)
 
 find_package(XercesC REQUIRED)
 
@@ -24,7 +22,7 @@ set(HEADERS
 add_library( ${name}  SHARED ${SOURCES} ${HEADERS} )
 
 target_link_libraries( ${name} PUBLIC
-    Opticks::SysRap 
+    SysRap 
     XercesC::XercesC
 )
 
@@ -35,12 +33,13 @@ target_include_directories( ${name} PUBLIC
 )
 
 target_compile_definitions( ${name} PUBLIC OPTICKS_GDXML )
-target_compile_definitions( ${name} PUBLIC G4USE_STD11 ) 
-
-install(FILES ${HEADERS}  DESTINATION ${CMAKE_INSTALL_INCLUDEDIR})
-bcm_deploy(TARGETS ${name} NAMESPACE Opticks:: SKIP_HEADER_INSTALL)
-
-add_subdirectory(tests)
 
+install(FILES ${HEADERS} DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/${name})
 
+install(TARGETS ${name}
+        EXPORT EicOpticksTargets
+        LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
+        ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}
+)
 
+add_subdirectory(tests)

gdxml/tests/CMakeLists.txt

@@ -1,6 +1,4 @@
 set(name GDXMLTest)
-project(${name} VERSION 0.1.0)
-include(OpticksBuildOptions)   
 
 set(TEST_SOURCES
    GDXMLTest.cc

qudarap/CMakeLists.txt

@@ -1,19 +1,8 @@
 set(name QUDARap)
-project(${name} VERSION 0.1.0)
-include(OpticksBuildOptions NO_POLICY_SCOPE)      
-
-
-set(FLAGS_VERBOSE ON)
-
-set(LIBS  )
-
-set(LIBS ${LIBS} Opticks::SysRap)  
-
 
 set(Custom4_VERBOSE ON)
 find_package(Custom4 CONFIG)
 
-message(STATUS "${name} Custom4_FOUND:${Custom4_FOUND}  " )
 set(DEV_SOURCES
     QSim_cerenkov_dev.cu
 )
@@ -144,24 +133,17 @@ SET(HEADERS
     QBuf.hh
 )
 
-
-
-if(UNIX AND NOT APPLE)
-  set(LIBS ${LIBS} ssl )  
-endif()
-
 add_library( ${name} ${SOURCES} )
 
 get_target_property(ILL ${name} INTERFACE_LINK_LIBRARIES)
 message(STATUS "${name} INTERFACE_LINK_LIBRARIES:${ILL} " )
 
-
 if(Custom4_FOUND)
    target_compile_definitions( ${name} PUBLIC WITH_CUSTOM4 )
    target_include_directories( ${name} PUBLIC ${Custom4_INCLUDE_DIR})
 endif()
 
-target_link_libraries( ${name} ${LIBS})
+target_link_libraries( ${name} SysRap ssl)
 target_compile_definitions( ${name} PUBLIC OPTICKS_QUDARAP DEBUG_TAG )
 
 
@@ -191,14 +173,18 @@ WITH_THRUST compile definition
 
 target_compile_definitions( ${name} PRIVATE WITH_THRUST )
 
-target_include_directories( ${name}
-   PUBLIC $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}>
-   $<INSTALL_INTERFACE:include>
-   $<INSTALL_INTERFACE:include/QUDARap>
+target_include_directories( ${name} PUBLIC
+    $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}>
+    $<BUILD_INTERFACE:${CMAKE_BINARY_DIR}/sysrap/inc>
+    $<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}>
 )
 
-install(FILES ${HEADERS} DESTINATION ${CMAKE_INSTALL_INCLUDEDIR})
+install(FILES ${HEADERS} DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/${name})
 
-bcm_deploy(TARGETS ${name} NAMESPACE Opticks:: SKIP_HEADER_INSTALL)
+install(TARGETS ${name}
+        EXPORT EicOpticksTargets
+        LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
+        ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}
+)
 
 add_subdirectory(tests)

qudarap/tests/CMakeLists.txt

@@ -1,6 +1,4 @@
 set(name QUDARapTest)
-project(${name} VERSION 0.1.0)
-include(OpticksBuildOptions)   
 
 find_package(CUDAToolkit REQUIRED)
 
@@ -48,7 +46,6 @@ foreach(SRC ${TEST_SOURCES})
     get_filename_component(TGT ${SRC} NAME_WE)
     add_executable(${TGT} ${SRC})
     target_link_libraries(${TGT} QUDARap CUDA::cudart)
-    target_include_directories(${TGT} PRIVATE $<BUILD_INTERFACE:${CMAKE_BINARY_DIR}/sysrap/inc>)
 
     add_test(
        NAME ${name}.${TGT} 
@@ -64,21 +61,6 @@ foreach(SRC ${KNOWN_FAIL_TEST_SOURCES})
 endforeach()
 
 
-
-
-set(TEST_SOURCES_CU
-)
-
-foreach(CU ${TEST_SOURCES_CU})
-    get_filename_component(TGT ${CU} NAME_WE)
-    cuda_add_executable(${TGT} ${CU} OPTIONS)
-    add_test(${name}.${TGT} ${TGT})
-
-    target_link_libraries(${TGT} QUDARap )
-endforeach()
-
-
-
 ## HMM: switch to Custom4 (not getting that indirectly via PMTSim) 
 find_package(PMTSim_standalone CONFIG)