Import Geant4 11.0.0.beta source tree

source/g3tog4/CMakeLists.txt

@@ -1,11 +1,8 @@
-#------------------------------------------------------------------------------
-# Module : G3toG4
-# Package: Geant4.src.G3toG4
-#------------------------------------------------------------------------------
+# - G3toG4 category build
 
 geant4_global_library_target(COMPONENTS sources.cmake)
 
-# We also need to build the rztog4 application
+# OBSOLETE: build the rztog4 application
 # It's not a Mac Bundle or WIN32 app (i.e. no GUI!!)
 # Will need cernlib libraries, but no FindPackage for that yet...
 # Hmm, means it'll probably be UNIX only...
@@ -13,12 +10,11 @@ geant4_global_library_target(COMPONENTS sources.cmake)
 # need CERNLIB
 #
 #include_directories(include)
-#add_executable(rztog4 
-#    src/g3routines.F  
-#    src/jshape.F  
+#add_executable(rztog4
+#    src/g3routines.F
+#    src/jshape.F
 #    src/rztog4.F
-#    src/g3tog4.F      
-#    src/mztog4.F  
+#    src/g3tog4.F
+#    src/mztog4.F
 #    src/tog4.F
 #)
-

source/g3tog4/History

@@ -2,6 +2,9 @@
 G3toG4 Modification History (reverse chronological order, please !)
 --------------------------------------------------------------------
 
+g3tog4-V10-07-00 1-April-2021 B.Morgan
+- Migrate build to modular CMake API
+
 g3tog4-V10-06-01 28-May-2020 B.Morgan
 - Remove obsolete G4brep module dependency
 

source/g3tog4/sources.cmake

@@ -1,13 +1,8 @@
-#------------------------------------------------------------------------------
-# Module : G3toG4
-# Package: Geant4.src.G3toG4
-#------------------------------------------------------------------------------
+# - G3toG4 module build definition
 
-#
 # Define the Geant4 Module.
-#
-geant4_define_module(NAME G3toG4
-  HEADERS
+geant4_add_module(G3toG4
+  PUBLIC_HEADERS
     G3DetTable.hh
     G3DetTableEntry.hh
     G3Division.hh
@@ -75,35 +70,22 @@ geant4_define_module(NAME G3toG4
     G4gstmed.cc
     G4gstpar.cc
     G4gsvolu.cc
-    clparse.cc
-  GRANULAR_DEPENDENCIES
-    G4csg
-    G4decay
-    G4detector
-    G4geomBoolean
-    G4geometrymng
-    G4globman
-    G4graphics_reps
-    G4hits
-    G4magneticfield
-    G4materials
-    G4partman
-    G4procman
-    G4specsolids
-    G4track
-    G4tracking
-    G4volumes
-  GLOBAL_DEPENDENCIES
-    G4digits_hits
-    G4geometry
-    G4global
-    G4graphics_reps
-    G4materials
-    G4particles
-    G4processes
-    G4track
-    G4tracking
-  LINK_LIBRARIES
-)
+    clparse.cc)
 
-# List any source specific properties here
+geant4_module_link_libraries(G3toG4
+  PUBLIC
+    G4detector
+    G4geometrymng
+    G4partman
+    G4materials
+    G4globman
+    G4hepgeometry
+  PRIVATE
+    G4decay
+    G4procman
+    G4csg
+    G4specsolids
+    G4magneticfield
+    G4volumes
+    G4geomBoolean
+    G4graphics_reps)