BNLNPPS · plexoos · May 12, 2025 · Mar 27, 2025 · Mar 27, 2025
diff --git a/CSG/CMakeLists.txt b/CSG/CMakeLists.txt
@@ -23,7 +23,6 @@ list(APPEND SOURCES
     CSGImport.cc
     CSGTarget.cc
 
-
     CSGScan.cc
     CSGScan.cu
 
@@ -42,9 +41,6 @@ list(APPEND SOURCES
     CSG_LOG.cc
 )
 
-#    CSGGenstep.cc
-#    CSG_stree_Convert.h 
-
 list(APPEND CSG_HEADERS
     CSGNode.h 
 
@@ -78,11 +74,6 @@ list(APPEND CSG_HEADERS
     CSG_API_EXPORT.hh 
 )
 
-
-#    CSGGenstep.h
-
-
-
 list(APPEND INTERSECT_HEADERS
     csg_intersect_leaf.h 
     csg_intersect_node.h 
@@ -117,66 +108,27 @@ list(APPEND INTERSECT_HEADERS
     f4_stack.h
 )
 
-
 list(APPEND HEADERS
     ${CSG_HEADERS}
     ${INTERSECT_HEADERS}
 )
 
-
-message(STATUS "CMAKE_INSTALL_PREFIX     : ${CMAKE_INSTALL_PREFIX}")
-message(STATUS "CMAKE_INSTALL_INCLUDEDIR : ${CMAKE_INSTALL_INCLUDEDIR}")
-message(STATUS "CMAKE_INSTALL_LIBDIR     : ${CMAKE_INSTALL_LIBDIR}")
-message(STATUS "CMAKE_BINARY_DIR         : ${CMAKE_BINARY_DIR}")
-
-
-#add_library( ${name}  SHARED ${SOURCES} ${HEADERS} )
-
 add_library( ${name} ${SOURCES} )
 
-
 target_compile_definitions( ${name} PUBLIC OPTICKS_CSG )
 target_compile_definitions( ${name} PUBLIC WITH_CONTIGUOUS )
-
-
-#[=[
-DEBUG,DEBUG_RECORD,DEBUG_CYLINDER,DEBUG_CONE preprocessor macros
--------------------------------------------------------------------
-
-* WARNING : these DEBUG flags are exceedingly verbose 
-* note that nvcc compilation will fail when these are enabled, 
-  as they are intended for CPU debugging of GPU code. 
-  Some use std::vector for collecting CSGRecords. 
-
-* the flags effect critical parts of CSG intersection algorithm 
-* flags are intended for CPU debugging of CUDA compatible code 
-* only use them for tests of single or small numbers of intersections 
-* DO NOT COMMIT WITH THESE UNCOMMENTED
-
-#]=]
-
-#target_compile_definitions( ${name} PRIVATE DEBUG )
-#target_compile_definitions( ${name} PRIVATE DEBUG_RECORD )
-#target_compile_definitions( ${name} PRIVATE DEBUG_CYLINDER )
-#target_compile_definitions( ${name} PRIVATE DEBUG_CONE )
-
 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_link_libraries(${name} PUBLIC ${CUDA_LIBRARIES} Opticks::SysRap)
 target_link_libraries(${name} Opticks::SysRap)
 
-
 bcm_deploy(TARGETS ${name} NAMESPACE Opticks:: SKIP_HEADER_INSTALL)
 
 install(FILES ${HEADERS}  DESTINATION ${CMAKE_INSTALL_INCLUDEDIR})
 
-
 add_subdirectory(tests)
-
diff --git a/CSG/tests/CMakeLists.txt b/CSG/tests/CMakeLists.txt
@@ -1,6 +1,5 @@
 set(name CSGTest)
 
-#find_package(OpticksCore REQUIRED CONFIG)
 find_package(CUDAToolkit REQUIRED)
 
 set(TEST_SOURCES
@@ -64,24 +63,17 @@ set( DEFERRED_TEST_SOURCES
     CSGGeometryFromGeocacheTest.cc
 )
 
-find_program(BASH_EXECUTABLE NAMES bash REQUIRED)
-message(STATUS "BASH_EXECUTABLE : ${BASH_EXECUTABLE}")
-
 foreach(SRC ${TEST_SOURCES})
     get_filename_component(TGT ${SRC} NAME_WE)
     add_executable(${TGT} ${SRC})
     target_link_libraries(${TGT} Opticks::CSG CUDA::cudart)
 
-    #add_test(${name}.${TGT} ${TGT})
     add_test(
        NAME ${name}.${TGT} 
        COMMAND bash ${CMAKE_CURRENT_SOURCE_DIR}/CSGTestRunner.sh ${CMAKE_CURRENT_BINARY_DIR}/${TGT}
     )
 endforeach()
 
-
-
 set(TGT CSGDemoTest)
 add_executable(${TGT} CSGDemoTest.cc DemoGeo.cc DemoGrid.cc)
-#target_link_libraries(${TGT} Opticks::CSG Opticks::OpticksCore)
 target_link_libraries(${TGT} Opticks::CSG CUDA::cudart)
diff --git a/CSGOptiX/CMakeLists.txt b/CSGOptiX/CMakeLists.txt
@@ -5,10 +5,6 @@ include(OpticksBuildOptions)
 find_package(OptiX)
 
 get_target_property(CSG_INCLUDE_DIRS Opticks::CSG INTERFACE_INCLUDE_DIRECTORIES)
-
-message(STATUS "CSG_FOUND     : ${CSG_FOUND} ")
-message(STATUS "CSG_INCLUDE_DIRS : ${CSG_INCLUDE_DIRS} ")
-
 set(buildenvpath ${CMAKE_CURRENT_BINARY_DIR}/buildenv.sh)
 file(WRITE ${buildenvpath} "export OPTIX_VERSION=${OptiX_VERSION}\n")
 message(STATUS "write to buildenvpath ${buildenvpath} ")
@@ -20,20 +16,6 @@ include_directories(
 )
 
 
-#set(COMPUTE_CAPABILITY $ENV{OPTICKS_COMPUTE_CAPABILITY})
-#set(CUDA_NVCC_FLAGS)
-#list(APPEND CUDA_NVCC_FLAGS "-Xcompiler -fPIC")
-#list(APPEND CUDA_NVCC_FLAGS "-gencode=arch=compute_${COMPUTE_CAPABILITY},code=sm_${COMPUTE_CAPABILITY}")
-#list(APPEND CUDA_NVCC_FLAGS "-O2")
-#list(APPEND CUDA_NVCC_FLAGS "--use_fast_math")
-#list(APPEND CUDA_NVCC_FLAGS "-std=c++11")
-
-#[=[
-CUDA_NVCC_FLAGS are set in cmake/Modules/OpticksCUDAFlags.cmake
-its better to set them in one place
-#]=]
-
-
 set(SOURCES)
 set(CU_SOURCES)
 
@@ -86,7 +68,6 @@ foreach(cu_src IN LISTS CU_SOURCES)
     list(APPEND _generated_PTX_files "${cu_src}.ptx")
 endforeach()
 
-message(STATUS "_generated_OBJ_files ${_generated_OBJ_files}") 
 message(STATUS "_generated_PTX_files ${_generated_PTX_files}") 
 
 add_library( ${name} SHARED ${SOURCES} ${HEADERS} )
@@ -97,9 +78,6 @@ target_compile_definitions( ${name} PUBLIC WITH_SIMTRACE )
 target_compile_definitions( ${name} PUBLIC WITH_RENDER )
 target_compile_definitions( ${name} PUBLIC OPTICKS_CSGOPTIX )
 
-# target_compile_definitions( ${name} PUBLIC DEBUG_TAG )     ## NOW FROM sysrap/CMakeLists.txt
-# target_compile_definitions( ${name} PUBLIC DEBUG_PIDXYZ )  ## NOW FROM sysrap/CMakeLists.txt Debug/Release CONTROL 
-
 #[=[
 
 WITH_THRUST compile definition
@@ -136,4 +114,3 @@ install(FILES ${HEADERS}  DESTINATION ${CMAKE_INSTALL_INCLUDEDIR})
 add_subdirectory(tests)
 
 bcm_deploy(TARGETS ${name} NAMESPACE Opticks:: SKIP_HEADER_INSTALL)
-
diff --git a/CSGOptiX/tests/CMakeLists.txt b/CSGOptiX/tests/CMakeLists.txt
@@ -56,18 +56,13 @@ foreach(SRC ${VIZ_SOURCES})
          )
 endforeach()
 
-
-
 foreach(SRC ${TEST_SOURCES})
     get_filename_component(TGT ${SRC} NAME_WE)
     add_executable(${TGT} ${SRC})
     target_link_libraries(${TGT} CSGOptiX CUDA::cudart)
 
-    #add_test(${name}.${TGT} ${TGT})
     add_test(
        NAME ${name}.${TGT} 
        COMMAND bash ${CMAKE_CURRENT_SOURCE_DIR}/CXTestRunner.sh ${CMAKE_CURRENT_BINARY_DIR}/${TGT}
     )
 endforeach()
-
-
diff --git a/g4cx/CMakeLists.txt b/g4cx/CMakeLists.txt
@@ -3,19 +3,6 @@ set(desc "Top Level")
 project(${name} VERSION 0.1.0)
 include(OpticksBuildOptions NO_POLICY_SCOPE)
 
-#[=[
-G4CX
-=====
-
-#]=]
-
-#find_package(Custom4 CONFIG)   # hmm U4 looks for Custom4 and does setup
-
-message(STATUS "${CMAKE_CURRENT_LIST_FILE} : Custom4_FOUND      : ${Custom4_FOUND}")
-message(STATUS "${CMAKE_CURRENT_LIST_FILE} : Custom4_VERSION    : ${Custom4_VERSION}")
-
-
-
 set(SOURCES
     G4CX_LOG.cc 
     G4CXOpticks.cc
@@ -47,6 +34,3 @@ install(FILES ${HEADERS}  DESTINATION ${CMAKE_INSTALL_INCLUDEDIR})
 bcm_deploy(TARGETS ${name} NAMESPACE Opticks:: SKIP_HEADER_INSTALL)
 
 add_subdirectory(tests)
-
-
-
diff --git a/g4cx/tests/CMakeLists.txt b/g4cx/tests/CMakeLists.txt
@@ -40,24 +40,13 @@ foreach(SRC ${SINGLE_SOURCES})
 endforeach()
 
 
-#find_program(BASH_EXECUTABLE NAMES bash REQUIRED)
-#message(STATUS "BASH_EXECUTABLE : ${BASH_EXECUTABLE}")
-
 foreach(SRC ${TEST_SOURCES})
     get_filename_component(TGT ${SRC} NAME_WE)
     add_executable(${TGT} ${SRC})
     target_link_libraries(${TGT} G4CX CUDA::cudart)
 
-    #add_test(${name}.${TGT} ${TGT})
     add_test(
        NAME ${name}.${TGT} 
        COMMAND bash ${CMAKE_CURRENT_SOURCE_DIR}/GXTestRunner.sh ${CMAKE_CURRENT_BINARY_DIR}/${TGT}
     )
 endforeach()
-
-
-
-
-
-
-
diff --git a/gdxml/CMakeLists.txt b/gdxml/CMakeLists.txt
@@ -3,15 +3,6 @@ set(desc "XML Level xercesc fixing GDML")
 project(${name} VERSION 0.1.0)
 include(OpticksBuildOptions NO_POLICY_SCOPE)
 
-#[=[
-
-
-#]=]
-
-
-#set(G4_VERBOSE YES)
-#set(OpticksXercesC_VERBOSE YES)
-
 find_package(XercesC REQUIRED)
 
 set(SOURCES

diff --git a/qudarap/CMakeLists.txt b/qudarap/CMakeLists.txt
@@ -14,16 +14,6 @@ set(Custom4_VERBOSE ON)
 find_package(Custom4 CONFIG)
 
 message(STATUS "${name} Custom4_FOUND:${Custom4_FOUND}  " )
-
-#[=[
-A successful find of Custom4 runs some CMake config, see::
-
-    epsilon:qudarap blyth$ cat ${OPTICKS_PREFIX}_externals/custom4/0.1.9/lib/Custom4-0.1.9/Custom4Config.cmake | grep WITH
-    set(Custom4_DEFINITIONS -DWITH_CUSTOM4 )
-          INTERFACE_COMPILE_DEFINITIONS "WITH_CUSTOM4"
-
-#]=]
-
 set(DEV_SOURCES
     QSim_cerenkov_dev.cu
 )
@@ -91,9 +81,6 @@ set(SOURCES
     QBuf.cc
 )
 
-
-
-
 SET(HEADERS
     QUDARAP_LOG.hh
     QUDARAP_API_EXPORT.hh
@@ -163,28 +150,11 @@ 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} " )
 
-#[=[
-As QUDARap only requires a single header-only header from Custom4,
-not the library it is unnecessarily adding dependency on the lib and 
-all the Geant4 libs when hooking up the full target with::
-
-   # set(LIBS ${LIBS} Custom4::Custom4) 
-
-So instead just hookup the include_directories and 
-compile_definitions not the full target. 
-#]=]
 
 if(Custom4_FOUND)
    target_compile_definitions( ${name} PUBLIC WITH_CUSTOM4 )
@@ -194,15 +164,6 @@ endif()
 target_link_libraries( ${name} ${LIBS})
 target_compile_definitions( ${name} PUBLIC OPTICKS_QUDARAP DEBUG_TAG )
 
-#[=[
-
-https://stackoverflow.com/questions/34490294/what-does-configdebugrelease-mean-in-cmake
-
-   $<CONFIG:Debug>   1 for Debug, 0 otherwise
-   $<1:X>            X 
-   $<0:X>            Empty 
-
-#]=]
 
 #[=[
 
@@ -230,22 +191,14 @@ WITH_THRUST compile definition
 
 target_compile_definitions( ${name} PRIVATE WITH_THRUST )
 
-#target_compile_definitions( ${name} PRIVATE DEBUG_TIME )
 target_include_directories( ${name}
    PUBLIC $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}>
    $<INSTALL_INTERFACE:include>
    $<INSTALL_INTERFACE:include/QUDARap>
 )
 
-# see notes/issues/QUDARap_symbol_visibility_warnings.rst 
-#set_target_properties( ${name} PROPERTIES CXX_VISIBILITY_PRESET hidden )
-
-
-
 install(FILES ${HEADERS} DESTINATION ${CMAKE_INSTALL_INCLUDEDIR})
 
 bcm_deploy(TARGETS ${name} NAMESPACE Opticks:: SKIP_HEADER_INSTALL)
 
 add_subdirectory(tests)
-
-