Import Geant4 10.7.0.beta source tree

2020-06-26 10:23:25 +02:00
parent c02c370437
commit 67ba86d073
1871 changed files with 174422 additions and 131884 deletions
@@ -1,17 +0,0 @@
-#------------------------------------------------------------------------------
-# CMakeLists.txt
-# Module : G4volumes
-# Package: Geant4.src.G4geometry.G4volumes
-#
-# CMakeLists.txt for building a single granular library.
-#
-# Generated on : 24/9/2010
-#
-#
-#------------------------------------------------------------------------------
-
-if(GEANT4_BUILD_GRANULAR_LIBS)
-    include(Geant4MacroLibraryTargets)
-    GEANT4_GRANULAR_LIBRARY_TARGET(COMPONENT sources.cmake)
-endif()
-
@@ -16,6 +16,10 @@ commit in the repository !
     * Reverse chronological order (last date on top), please *
     ----------------------------------------------------------

+December 10th, 2019 B.Morgan               - geomvol-V10-06-00
+- Cleanup CMake build, removing obsolete granular library options and
+  explicit include_directories.
+
 November 26th, 2019 G.Cosmo                - geomvol-V10-05-10
 - Fixed more cases of implicit type conversions from size_t to G4int.

@@ -1,99 +1,73 @@
 #------------------------------------------------------------------------------
-# sources.cmake
 # Module : G4volumes
 # Package: Geant4.src.G4geometry.G4volumes
-#
-# Sources description for a library.
-# Lists the sources and headers of the code explicitely.
-# Lists include paths needed.
-# Lists the internal granular and global dependencies of the library.
-# Source specific properties should be added at the end.
-#
-# Generated on : 24/9/2010
-#
-#
 #------------------------------------------------------------------------------

-# List external includes needed.
-include_directories(${CLHEP_INCLUDE_DIRS})
-
-# List internal includes needed.
-include_directories(${CMAKE_SOURCE_DIR}/source/geometry/magneticfield/include)
-include_directories(${CMAKE_SOURCE_DIR}/source/geometry/management/include)
-include_directories(${CMAKE_SOURCE_DIR}/source/global/HEPGeometry/include)
-include_directories(${CMAKE_SOURCE_DIR}/source/global/HEPRandom/include)
-include_directories(${CMAKE_SOURCE_DIR}/source/global/management/include)
-include_directories(${CMAKE_SOURCE_DIR}/source/graphics_reps/include)
-include_directories(${CMAKE_SOURCE_DIR}/source/intercoms/include)
-
 #
 # Define the Geant4 Module.
 #
-include(Geant4MacroDefineModule)
-GEANT4_DEFINE_MODULE(NAME G4volumes
-    HEADERS
-        G4AssemblyTriplet.hh
-        G4AssemblyTriplet.icc
-        G4AssemblyStore.hh
-        G4AssemblyVolume.hh
-        G4AssemblyVolume.icc
-        G4EnhancedVecAllocator.hh
-        G4GeometryWorkspace.hh
-        G4GRSSolid.hh
-        G4GRSSolid.icc
-        G4GRSSolidHandle.hh
-        G4GRSVolume.hh
-        G4GRSVolume.icc
-        G4GRSVolumeHandle.hh
-        G4LogicalBorderSurface.hh
-        G4LogicalBorderSurface.icc
-        G4LogicalSkinSurface.hh
-        G4LogicalSkinSurface.icc
-        G4NavigationHistory.hh
-        G4NavigationHistory.icc
-        G4NavigationHistoryPool.hh
-        G4NavigationLevel.hh
-        G4NavigationLevel.icc
-        G4NavigationLevelRep.hh
-        G4NavigationLevelRep.icc
-        G4PVParameterised.hh
-        G4PVPlacement.hh
-        G4PVReplica.hh
-        G4ReflectionFactory.hh
-        G4TouchableHistory.hh
-        G4TouchableHistory.icc
-        G4TouchableHistoryHandle.hh
+geant4_define_module(NAME G4volumes
+  HEADERS
+    G4AssemblyTriplet.hh
+    G4AssemblyTriplet.icc
+    G4AssemblyStore.hh
+    G4AssemblyVolume.hh
+    G4AssemblyVolume.icc
+    G4EnhancedVecAllocator.hh
+    G4GeometryWorkspace.hh
+    G4GRSSolid.hh
+    G4GRSSolid.icc
+    G4GRSSolidHandle.hh
+    G4GRSVolume.hh
+    G4GRSVolume.icc
+    G4GRSVolumeHandle.hh
+    G4LogicalBorderSurface.hh
+    G4LogicalBorderSurface.icc
+    G4LogicalSkinSurface.hh
+    G4LogicalSkinSurface.icc
+    G4NavigationHistory.hh
+    G4NavigationHistory.icc
+    G4NavigationHistoryPool.hh
+    G4NavigationLevel.hh
+    G4NavigationLevel.icc
+    G4NavigationLevelRep.hh
+    G4NavigationLevelRep.icc
+    G4PVParameterised.hh
+    G4PVPlacement.hh
+    G4PVReplica.hh
+    G4ReflectionFactory.hh
+    G4TouchableHistory.hh
+    G4TouchableHistory.icc
+    G4TouchableHistoryHandle.hh
 	G4VExternalPhysicalVolume.hh
-    SOURCES
-        G4AssemblyStore.cc
-        G4AssemblyVolume.cc
-        G4GeometryWorkspace.cc
-        G4GRSSolid.cc
-        G4GRSVolume.cc
-        G4LogicalBorderSurface.cc
-        G4LogicalSkinSurface.cc
-        G4NavigationHistory.cc
-        G4NavigationHistoryPool.cc
-        G4NavigationLevel.cc
-        G4NavigationLevelRep.cc
-        G4PVParameterised.cc
-        G4PVPlacement.cc
-        G4PVReplica.cc
-        G4ReflectionFactory.cc
-        G4TouchableHistory.cc
+  SOURCES
+    G4AssemblyStore.cc
+    G4AssemblyVolume.cc
+    G4GeometryWorkspace.cc
+    G4GRSSolid.cc
+    G4GRSVolume.cc
+    G4LogicalBorderSurface.cc
+    G4LogicalSkinSurface.cc
+    G4NavigationHistory.cc
+    G4NavigationHistoryPool.cc
+    G4NavigationLevel.cc
+    G4NavigationLevelRep.cc
+    G4PVParameterised.cc
+    G4PVPlacement.cc
+    G4PVReplica.cc
+    G4ReflectionFactory.cc
+    G4TouchableHistory.cc
 	G4VExternalPhysicalVolume.cc
-    GRANULAR_DEPENDENCIES
-        G4geometrymng
-        G4globman
-        G4graphics_reps
-        G4intercoms
-        G4magneticfield
-    GLOBAL_DEPENDENCIES
-        G4global
-        G4graphics_reps
-        G4intercoms
-    LINK_LIBRARIES
+  GRANULAR_DEPENDENCIES
+    G4geometrymng
+    G4globman
+    G4graphics_reps
+    G4intercoms
+    G4magneticfield
+  GLOBAL_DEPENDENCIES
+    G4global
+    G4graphics_reps
+    G4intercoms
 )

 # List any source specific properties here
-