Import Geant4 10.7.0.beta source tree

source/readout/CMakeLists.txt

@@ -1,19 +1,6 @@
 #------------------------------------------------------------------------------
-# CMakeLists.txt
 # Module : G4readout
 # Package: Geant4.src.G4readout
-#
-# CMakeLists.txt for single level library that may be build global or granular
-#
-# Generated on : 24/9/2010
-#
-#
 #------------------------------------------------------------------------------
 
-include(Geant4MacroLibraryTargets)
-if(GEANT4_BUILD_GRANULAR_LIBS)
-    GEANT4_GRANULAR_LIBRARY_TARGET(COMPONENT sources.cmake)
-else()
-    GEANT4_GLOBAL_LIBRARY_TARGET(COMPONENTS sources.cmake)
-endif()
-
+geant4_global_library_target(COMPONENTS sources.cmake)

source/readout/History

@@ -16,6 +16,10 @@ committal in the CVS repository !
      * Reverse chronological order (last date on top), please *
      ----------------------------------------------------------
 
+Dec 9, 2019,  B. Morgan (readout-V10-06-00)
+- Cleanup CMake build, removing obsolete granular library option and
+  explicit include_directories.
+
 Nov 26, 2019,  G.Cosmo (readout-V10-05-01)
 - Fixed cases of implicit type conversions from size_t to G4int.
 

source/readout/sources.cmake

@@ -1,87 +1,52 @@
 #------------------------------------------------------------------------------
-# sources.cmake
 # Module : G4readout
 # Package: Geant4.src.G4readout
-#
-# 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/digits_hits/detector/include)
-include_directories(${CMAKE_SOURCE_DIR}/source/digits_hits/digits/include)
-include_directories(${CMAKE_SOURCE_DIR}/source/digits_hits/hits/include)
-include_directories(${CMAKE_SOURCE_DIR}/source/event/include)
-include_directories(${CMAKE_SOURCE_DIR}/source/geometry/management/include)
-include_directories(${CMAKE_SOURCE_DIR}/source/geometry/navigation/include)
-include_directories(${CMAKE_SOURCE_DIR}/source/geometry/volumes/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/intercoms/include)
-include_directories(${CMAKE_SOURCE_DIR}/source/materials/include)
-include_directories(${CMAKE_SOURCE_DIR}/source/particles/management/include)
-include_directories(${CMAKE_SOURCE_DIR}/source/processes/electromagnetic/utils/include)
-include_directories(${CMAKE_SOURCE_DIR}/source/processes/management/include)
-include_directories(${CMAKE_SOURCE_DIR}/source/run/include)
-include_directories(${CMAKE_SOURCE_DIR}/source/track/include)
-include_directories(${CMAKE_SOURCE_DIR}/source/tracking/include)
-
 #
 # Define the Geant4 Module.
 #
-include(Geant4MacroDefineModule)
-GEANT4_DEFINE_MODULE(NAME G4readout
-    HEADERS
-        G4DCtable.hh
-        G4DMmessenger.hh
-        G4DigiManager.hh
-        G4VDigitizerModule.hh
-    SOURCES
-        G4DCtable.cc
-        G4DMmessenger.cc
-        G4DigiManager.cc
-        G4VDigitizerModule.cc
-    GRANULAR_DEPENDENCIES
-        G4detector
-        G4digits
-        G4emutils
-        G4event
-        G4geometrymng
-        G4globman
-        G4hits
-        G4intercoms
-        G4materials
-        G4navigation
-        G4partman
-        G4procman
-        G4run
-        G4track
-        G4tracking
-        G4volumes
-    GLOBAL_DEPENDENCIES
-        G4digits_hits
-        G4event
-        G4geometry
-        G4global
-        G4intercoms
-        G4materials
-        G4particles
-        G4processes
-        G4run
-        G4track
-        G4tracking
-    LINK_LIBRARIES
+geant4_define_module(NAME G4readout
+  HEADERS
+    G4DCtable.hh
+    G4DMmessenger.hh
+    G4DigiManager.hh
+  G4VDigitizerModule.hh
+  SOURCES
+    G4DCtable.cc
+    G4DMmessenger.cc
+    G4DigiManager.cc
+    G4VDigitizerModule.cc
+  GRANULAR_DEPENDENCIES
+    G4detector
+    G4digits
+    G4emutils
+    G4event
+    G4geometrymng
+    G4globman
+    G4hits
+    G4intercoms
+    G4materials
+    G4navigation
+    G4partman
+    G4procman
+    G4run
+    G4track
+    G4tracking
+    G4volumes
+  GLOBAL_DEPENDENCIES
+    G4digits_hits
+    G4event
+    G4geometry
+    G4global
+    G4intercoms
+    G4materials
+    G4particles
+    G4processes
+    G4run
+    G4track
+    G4tracking
+  LINK_LIBRARIES
 )
 
 # List any source specific properties here