Remove CLHEP external dependency - use instead the Geant4 internal CLHEP copy

GeoModel2G4/CMakeLists.txt

@@ -9,7 +9,7 @@ project( "GeoModel2G4" VERSION 1.0.0 LANGUAGES CXX )
 
 # External dependencies:
 find_package( Geant4 REQUIRED )
-find_package( CLHEP )
+
 # GeoModel dependencies
 find_package( GeoModelCore 3.2.0 REQUIRED )
 
@@ -44,8 +44,8 @@ include(${Geant4_USE_FILE})
 add_library( GeoModel2G4 SHARED ${HEADERS} ${SOURCES} )
 target_link_libraries( GeoModel2G4
   PUBLIC  ${GEANT4_LIBRARIES}
-  PRIVATE ${CLHEP_LIBRARIES} GeoMaterial2G4 GeoSpecialShapes)
-target_include_directories( GeoModel2G4 SYSTEM PUBLIC ${GEANT4_INCLUDE_DIRS} PRIVATE ${CLHEP_INCLUDE_DIRS} ${GeoModelCore_INCLUDE_DIRS} )
+  PRIVATE GeoMaterial2G4 GeoSpecialShapes)
+target_include_directories( GeoModel2G4 SYSTEM PUBLIC ${GEANT4_INCLUDE_DIRS} PRIVATE ${GeoModelCore_INCLUDE_DIRS} )
 target_include_directories( GeoModel2G4 PUBLIC
    $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}>
    $<INSTALL_INTERFACE:include> )

GeoSpecialShapes/CMakeLists.txt

@@ -5,12 +5,15 @@
 # Package: GeoSpecialShapes
 ################################################################################
 
-find_package(CLHEP)
+find_package( Geant4 REQUIRED )
 find_package(GeoModelCore 3.2.0 REQUIRED)
 
 # Use the GNU install directory names.
 include( GNUInstallDirs )  # it defines CMAKE_INSTALL_LIBDIR
 
+# include Geant4 headers
+include(${Geant4_USE_FILE})
+
 # Find the header and source files.
 file( GLOB SOURCES src/*.cxx src/LArWheelCalculator_Impl/*.cxx )
 file( GLOB HEADERS GeoSpecialShapes/*.h src/LArWheelCalculator_Impl/*.h)
@@ -18,7 +21,7 @@ file( GLOB HEADERS GeoSpecialShapes/*.h src/LArWheelCalculator_Impl/*.h)
 # Set the library.
 add_library( GeoSpecialShapes SHARED ${HEADERS} ${SOURCES} )
 target_link_libraries( GeoSpecialShapes PUBLIC
-PRIVATE GeoModelCore::GeoModelKernel ${CLHEP_LIBRARIES} )
+PRIVATE GeoModelCore::GeoModelKernel ${Geant4_LIBRARIES})
 target_include_directories( GeoSpecialShapes PUBLIC
    $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}>
    $<INSTALL_INTERFACE:include> )