Import Geant4 10.7.0.beta source tree

source/geometry/CMakeLists.txt

@@ -1,56 +1,37 @@
 #------------------------------------------------------------------------------
-# CMakeLists.txt
 # Module : G4geometry
 # Package: Geant4.src.G4geometry
-#
-# Top level CMakeLists.txt for a Geant4 Global Library
-# or collection of sublibraries
-#
-# Generated on : 24/9/2010
-#
-#
 #------------------------------------------------------------------------------
 
 # Add allocation export symbol for the geometry category
 add_definitions(-DG4GEOM_ALLOC_EXPORT)
 
-add_subdirectory(biasing)
-add_subdirectory(divisions)
-add_subdirectory(magneticfield)
-add_subdirectory(management)
-add_subdirectory(navigation)
-add_subdirectory(solids)
-add_subdirectory(volumes)
+geant4_global_library_target(NAME G4geometry
+  COMPONENTS
+    biasing/sources.cmake
+    divisions/sources.cmake
+    magneticfield/sources.cmake
+    management/sources.cmake
+    navigation/sources.cmake
+    solids/Boolean/sources.cmake
+    solids/CSG/sources.cmake
+    solids/specific/sources.cmake
+    volumes/sources.cmake
+  )
 
-if(NOT GEANT4_BUILD_GRANULAR_LIBS)
-  include(Geant4MacroLibraryTargets)
-  GEANT4_GLOBAL_LIBRARY_TARGET(NAME G4geometry
-    COMPONENTS
-      biasing/sources.cmake
-      divisions/sources.cmake
-      magneticfield/sources.cmake
-      management/sources.cmake
-      navigation/sources.cmake
-      solids/Boolean/sources.cmake
-      solids/CSG/sources.cmake
-      solids/specific/sources.cmake
-      volumes/sources.cmake
+# Temp hack to get "G4GeomConfig.hh" generated header in include
+# path for dependent targets
+# TODO: Remove once migration to new module/library system in place.
+#       This will automatically set include paths
+if(TARGET G4geometry)
+  target_include_directories(G4geometry PUBLIC
+    $<BUILD_INTERFACE:${CMAKE_CURRENT_BINARY_DIR}/include>
     )
-
-  # Temp hack to get "G4GeomConfig.hh" generated header in include
-  # path for dependent targets
-  # TODO: Remove once migration to new module/library system in place.
-  #       This will automatically set include paths
-  if(TARGET G4geometry)
-    target_include_directories(G4geometry PUBLIC
-      $<BUILD_INTERFACE:${CMAKE_CURRENT_BINARY_DIR}/include>
-      )
-  endif()
-
-  if(TARGET G4geometry-static)
-    target_include_directories(G4geometry-static PUBLIC
-      $<BUILD_INTERFACE:${CMAKE_CURRENT_BINARY_DIR}/include>
-    )
-  endif()
+endif()
+
+if(TARGET G4geometry-static)
+  target_include_directories(G4geometry-static PUBLIC
+    $<BUILD_INTERFACE:${CMAKE_CURRENT_BINARY_DIR}/include>
+  )
 endif()