Import Geant4 11.2.0.beta source tree

source/visualization/RayTracer/GNUmakefile

@@ -1,82 +0,0 @@
-
-name := G4RayTracer
-
-ifndef G4INSTALL
-  G4INSTALL = ../../..
-endif
-
-GLOBLIBS  = libG4vis_management.lib libG4modeling.lib
-GLOBLIBS += libG4run.lib libG4event.lib
-GLOBLIBS += libG4tracking.lib libG4processes.lib libG4digits_hits.lib
-GLOBLIBS += libG4track.lib libG4particles.lib libG4geometry.lib
-GLOBLIBS += libG4materials.lib libG4graphics_reps.lib
-GLOBLIBS += libG4intercoms.lib libG4global.lib
-
-include $(G4INSTALL)/config/architecture.gmk
-include $(G4INSTALL)/config/G4VIS_BUILD.gmk
-include $(G4INSTALL)/config/interactivity.gmk
-
-# NO need OGL, then reset OGLGLAGS
-OGLFLAGS =
-OGLLIBS  =
-# NO need QT, then reset QTGLAGS
-QTFLAGS =
-QTLIBS  =
-GLQTLIBS =
-
-CPPFLAGS += -DG4RAYTRACER_ALLOC_EXPORT
-
-CPPFLAGS += -I$(G4BASE)/visualization/modeling/include
-CPPFLAGS += -I$(G4BASE)/visualization/management/include
-CPPFLAGS += -I$(G4BASE)/graphics_reps/include
-CPPFLAGS += -I$(G4BASE)/global/management/include
-CPPFLAGS += -I$(G4BASE)/global/HEPGeometry/include
-CPPFLAGS += -I$(G4BASE)/global/HEPRandom/include
-CPPFLAGS += -I$(G4BASE)/geometry/management/include
-CPPFLAGS += -I$(G4BASE)/geometry/navigation/include
-CPPFLAGS += -I$(G4BASE)/geometry/solids/CSG/include
-CPPFLAGS += -I$(G4BASE)/geometry/solids/specific/include
-CPPFLAGS += -I$(G4BASE)/geometry/volumes/include
-CPPFLAGS += -I$(G4BASE)/geometry/magneticfield/include
-CPPFLAGS += -I$(G4BASE)/digits_hits/detector/include
-CPPFLAGS += -I$(G4BASE)/digits_hits/digits/include
-CPPFLAGS += -I$(G4BASE)/intercoms/include
-CPPFLAGS += -I$(G4BASE)/event/include
-CPPFLAGS += -I$(G4BASE)/run/include
-CPPFLAGS += -I$(G4BASE)/tasking/include
-CPPFLAGS += -I$(G4BASE)/track/include
-CPPFLAGS += -I$(G4BASE)/tracking/include
-CPPFLAGS += -I$(G4BASE)/digits_hits/hits/include
-CPPFLAGS += -I$(G4BASE)/particles/bosons/include
-CPPFLAGS += -I$(G4BASE)/particles/management/include
-CPPFLAGS += -I$(G4BASE)/processes/management/include
-CPPFLAGS += -I$(G4BASE)/processes/cuts/include
-CPPFLAGS += -I$(G4BASE)/processes/scoring/include
-CPPFLAGS += -I$(G4BASE)/materials/include
-
-# Locally adjust source list before including common.gmk
-sources := $(addprefix src/,G4RTJpegCoder.cc \
-  G4RTJpegMaker.cc \
-  G4RTMessenger.cc \
-  G4RTOutBitStream.cc \
-  G4RTPrimaryGeneratorAction.cc \
-  G4RTRun.cc \
-  G4RTRunAction.cc \
-  G4RTSimpleScanner.cc \
-  G4RTSteppingAction.cc \
-  G4RTTrackingAction.cc \
-  G4RTWorkerInitialization.cc \
-  G4RayTracer.cc \
-  G4RayTracerSceneHandler.cc \
-  G4RayTracerViewer.cc \
-  G4RayTrajectory.cc \
-  G4RayTrajectoryPoint.cc \
-  G4TheMTRayTracer.cc \
-  G4TheRayTracer.cc \
-  G4VRTScanner.cc)
-
-ifdef G4VIS_BUILD_RAYTRACERX_DRIVER
-  sources += src/G4RayTracerX.cc src/G4RayTracerXViewer.cc src/G4RTXScanner.cc
-endif
-
-include $(G4INSTALL)/config/common.gmk

source/visualization/RayTracer/History

@@ -6,6 +6,13 @@ It must **not** be used as a substitute for writing good git commit messages!
 
 -------------------------------------------------------------------------------
 
+## 2023-03-22 Ben Morgan (raytracer-V11-01-01)
+- Export public compile definitions to indicate availablity of specific drivers. Moves to
+  "use on link" model.
+
+## 2023-02-06 Ben Morgan (raytracer-V11-01-00)
+- Isolate private headers and update dependencies
+
 ## 2022-11-25 Gabriele Cosmo (raytracer-V11-00-06)
 - Fixed compilation warnings for implicit type conversions on macOS/XCode 14.1.
 

source/visualization/RayTracer/sources.cmake

@@ -3,6 +3,8 @@
 # Define the Geant4 Module.
 geant4_add_module(G4RayTracer
   PUBLIC_HEADERS 
+    G4RayTracer.hh
+  PRIVATE_HEADERS
     G4RTJpeg.hh
     G4RTJpegCoder.hh
     G4RTJpegCoderTables.hh
@@ -16,7 +18,6 @@ geant4_add_module(G4RayTracer
     G4RTSteppingAction.hh
     G4RTTrackingAction.hh
     G4RTWorkerInitialization.hh
-    G4RayTracer.hh
     G4RayTracerFeatures.hh
     G4RayTracerSceneHandler.hh
     G4RayTracerViewer.hh
@@ -51,25 +52,25 @@ geant4_module_compile_definitions(G4RayTracer PRIVATE G4RAYTRACER_ALLOC_EXPORT)
 
 geant4_module_link_libraries(G4RayTracer
   PUBLIC
-    G4globman
-    G4graphics_reps
-    G4modeling
-    G4run
-    G4hits
-    G4track
-    G4intercoms
-    G4tracking
     G4vis_management
-    G4hepgeometry
   PRIVATE
-    G4event
     G4bosons
-    G4geometrymng
-    G4scoring
-    G4partman
-    G4procman
     G4cuts
     G4detector
+    G4event
+    G4globman
+    G4graphics_reps
+    G4geometrymng
+    G4hepgeometry
+    G4hits
+    G4intercoms
+    G4modeling
+    G4partman
+    G4procman
+    G4run
+    G4scoring
+    G4track
+    G4tracking
     G4navigation)
 
 # X11 RayTracer only if selected
@@ -77,6 +78,7 @@ if(GEANT4_USE_RAYTRACER_X11)
   geant4_module_sources(G4RayTracer
     PUBLIC_HEADERS
       G4RayTracerX.hh
+    PRIVATE_HEADERS
       G4RayTracerXViewer.hh
       G4RTXScanner.hh
     SOURCES
@@ -84,5 +86,7 @@ if(GEANT4_USE_RAYTRACER_X11)
       G4RayTracerXViewer.cc
       G4RTXScanner.cc)
 
-  geant4_module_link_libraries(G4RayTracer PUBLIC X11::SM X11::ICE X11::X11 X11::Xext X11::Xmu)
+  geant4_module_compile_definitions(G4RayTracer PUBLIC G4VIS_USE_RAYTRACERX)
+
+  geant4_module_link_libraries(G4RayTracer PRIVATE X11::SM X11::ICE X11::X11 X11::Xext X11::Xmu)
 endif()