From 6cd52771162c30884faec25de9ebbfe309361d98 Mon Sep 17 00:00:00 2001 From: Dave Casper <dcasper@uci.edu> Date: Thu, 16 Jan 2020 00:43:40 +0000 Subject: [PATCH] Conform to ATLAS renaming GeoModel to GeoModelCore --- DetectorDescription/FaserReadoutGeometry/CMakeLists.txt | 2 +- .../GeoModel/GeoModelFaserUtilities/CMakeLists.txt | 2 +- DetectorDescription/GeoModel/GeoModelSvc/CMakeLists.txt | 2 +- DetectorDescription/GeoModel/GeoModelTest/CMakeLists.txt | 2 +- Scintillator/ScintDetDescr/ScintGeoModelUtils/CMakeLists.txt | 2 +- Scintillator/ScintDetDescr/ScintReadoutGeometry/CMakeLists.txt | 2 +- Scintillator/ScintDetDescr/VetoGeoModel/CMakeLists.txt | 2 +- Simulation/G4Utilities/Geo2G4/CMakeLists.txt | 2 +- Tracker/TrackerDetDescr/DipoleGeoModel/CMakeLists.txt | 2 +- Tracker/TrackerDetDescr/FaserSCT_GeoModel/CMakeLists.txt | 2 +- Tracker/TrackerDetDescr/TrackerGeoModelUtils/CMakeLists.txt | 2 +- Tracker/TrackerDetDescr/TrackerReadoutGeometry/CMakeLists.txt | 2 +- graphics/VTI12/VTI12Systems/VTI12GeometrySystems/CMakeLists.txt | 2 +- graphics/VTI12/VTI12Systems/VTI12TrackSystems/CMakeLists.txt | 2 +- graphics/VTI12/VTI12Utils/CMakeLists.txt | 2 +- 15 files changed, 15 insertions(+), 15 deletions(-) diff --git a/DetectorDescription/FaserReadoutGeometry/CMakeLists.txt b/DetectorDescription/FaserReadoutGeometry/CMakeLists.txt index 7866144d..df6eddbb 100644 --- a/DetectorDescription/FaserReadoutGeometry/CMakeLists.txt +++ b/DetectorDescription/FaserReadoutGeometry/CMakeLists.txt @@ -27,7 +27,7 @@ atlas_depends_on_subdirs( PUBLIC # External dependencies: find_package( CLHEP ) find_package( Eigen ) -find_package( GeoModel ) +find_package( GeoModelCore ) # Component(s) in the package: atlas_add_library( FaserReadoutGeometry diff --git a/DetectorDescription/GeoModel/GeoModelFaserUtilities/CMakeLists.txt b/DetectorDescription/GeoModel/GeoModelFaserUtilities/CMakeLists.txt index 8028900c..f138e933 100644 --- a/DetectorDescription/GeoModel/GeoModelFaserUtilities/CMakeLists.txt +++ b/DetectorDescription/GeoModel/GeoModelFaserUtilities/CMakeLists.txt @@ -23,7 +23,7 @@ atlas_depends_on_subdirs( PUBLIC find_package( Boost COMPONENTS filesystem thread system ) find_package( Eigen ) find_package( CORAL COMPONENTS CoralBase CoralKernel RelationalAccess ) -find_package( GeoModel ) +find_package( GeoModelCore ) # Component(s) in the package: atlas_add_library( GeoModelFaserUtilities diff --git a/DetectorDescription/GeoModel/GeoModelSvc/CMakeLists.txt b/DetectorDescription/GeoModel/GeoModelSvc/CMakeLists.txt index d4ba92d1..381aa7c5 100644 --- a/DetectorDescription/GeoModel/GeoModelSvc/CMakeLists.txt +++ b/DetectorDescription/GeoModel/GeoModelSvc/CMakeLists.txt @@ -26,7 +26,7 @@ find_package( Boost COMPONENTS filesystem thread system ) find_package( CORAL COMPONENTS CoralBase CoralKernel RelationalAccess ) -find_package( GeoModel ) +find_package( GeoModelCore ) # Component(s) in the package: atlas_add_component( GeoModelSvc diff --git a/DetectorDescription/GeoModel/GeoModelTest/CMakeLists.txt b/DetectorDescription/GeoModel/GeoModelTest/CMakeLists.txt index 900dbf3e..5e1e09ed 100644 --- a/DetectorDescription/GeoModel/GeoModelTest/CMakeLists.txt +++ b/DetectorDescription/GeoModel/GeoModelTest/CMakeLists.txt @@ -16,7 +16,7 @@ atlas_depends_on_subdirs( PRIVATE ) # External dependencies: -find_package( GeoModel ) +find_package( GeoModelCore ) # Component(s) in the package: atlas_add_component( GeoModelTest diff --git a/Scintillator/ScintDetDescr/ScintGeoModelUtils/CMakeLists.txt b/Scintillator/ScintDetDescr/ScintGeoModelUtils/CMakeLists.txt index 44c51708..d582f262 100644 --- a/Scintillator/ScintDetDescr/ScintGeoModelUtils/CMakeLists.txt +++ b/Scintillator/ScintDetDescr/ScintGeoModelUtils/CMakeLists.txt @@ -22,7 +22,7 @@ atlas_depends_on_subdirs( PUBLIC find_package( Boost COMPONENTS filesystem thread system ) find_package( CLHEP ) find_package( CORAL COMPONENTS CoralBase CoralKernel RelationalAccess ) -find_package( GeoModel ) +find_package( GeoModelCore ) # Component(s) in the package: atlas_add_library( ScintGeoModelUtils diff --git a/Scintillator/ScintDetDescr/ScintReadoutGeometry/CMakeLists.txt b/Scintillator/ScintDetDescr/ScintReadoutGeometry/CMakeLists.txt index 36464048..992fbb0b 100644 --- a/Scintillator/ScintDetDescr/ScintReadoutGeometry/CMakeLists.txt +++ b/Scintillator/ScintDetDescr/ScintReadoutGeometry/CMakeLists.txt @@ -30,7 +30,7 @@ atlas_depends_on_subdirs( PUBLIC # External dependencies: find_package( CLHEP ) find_package( Eigen ) -find_package( GeoModel ) +find_package( GeoModelCore ) # Component(s) in the package: atlas_add_library( ScintReadoutGeometry diff --git a/Scintillator/ScintDetDescr/VetoGeoModel/CMakeLists.txt b/Scintillator/ScintDetDescr/VetoGeoModel/CMakeLists.txt index 97e45b33..b590639e 100644 --- a/Scintillator/ScintDetDescr/VetoGeoModel/CMakeLists.txt +++ b/Scintillator/ScintDetDescr/VetoGeoModel/CMakeLists.txt @@ -31,7 +31,7 @@ atlas_depends_on_subdirs( PUBLIC find_package( Boost COMPONENTS filesystem thread system ) find_package( CORAL COMPONENTS CoralBase CoralKernel RelationalAccess ) find_package( Eigen ) -find_package( GeoModel ) +find_package( GeoModelCore ) # Component(s) in the package: atlas_add_component( VetoGeoModel diff --git a/Simulation/G4Utilities/Geo2G4/CMakeLists.txt b/Simulation/G4Utilities/Geo2G4/CMakeLists.txt index cc72f51f..a6b11f4d 100644 --- a/Simulation/G4Utilities/Geo2G4/CMakeLists.txt +++ b/Simulation/G4Utilities/Geo2G4/CMakeLists.txt @@ -27,7 +27,7 @@ find_package( CLHEP ) find_package( Geant4 ) find_package( ROOT COMPONENTS MathCore RIO Core Tree Hist pthread ) find_package( XercesC ) -find_package( GeoModel ) +find_package( GeoModelCore ) # Component(s) in the package: atlas_add_library( Geo2G4Lib diff --git a/Tracker/TrackerDetDescr/DipoleGeoModel/CMakeLists.txt b/Tracker/TrackerDetDescr/DipoleGeoModel/CMakeLists.txt index c0a38bf6..c4aeda23 100644 --- a/Tracker/TrackerDetDescr/DipoleGeoModel/CMakeLists.txt +++ b/Tracker/TrackerDetDescr/DipoleGeoModel/CMakeLists.txt @@ -27,7 +27,7 @@ atlas_depends_on_subdirs( PUBLIC find_package( Boost COMPONENTS filesystem thread system ) find_package( CORAL COMPONENTS CoralBase CoralKernel RelationalAccess ) find_package( Eigen ) -find_package( GeoModel ) +find_package( GeoModelCore ) # Component(s) in the package: atlas_add_component( DipoleGeoModel diff --git a/Tracker/TrackerDetDescr/FaserSCT_GeoModel/CMakeLists.txt b/Tracker/TrackerDetDescr/FaserSCT_GeoModel/CMakeLists.txt index 1258b953..0f9ae155 100644 --- a/Tracker/TrackerDetDescr/FaserSCT_GeoModel/CMakeLists.txt +++ b/Tracker/TrackerDetDescr/FaserSCT_GeoModel/CMakeLists.txt @@ -29,7 +29,7 @@ atlas_depends_on_subdirs( PUBLIC find_package( Boost COMPONENTS filesystem thread system ) find_package( CORAL COMPONENTS CoralBase CoralKernel RelationalAccess ) find_package( Eigen ) -find_package( GeoModel ) +find_package( GeoModelCore ) # Component(s) in the package: atlas_add_component( FaserSCT_GeoModel diff --git a/Tracker/TrackerDetDescr/TrackerGeoModelUtils/CMakeLists.txt b/Tracker/TrackerDetDescr/TrackerGeoModelUtils/CMakeLists.txt index c1afb08a..e0fdcf14 100644 --- a/Tracker/TrackerDetDescr/TrackerGeoModelUtils/CMakeLists.txt +++ b/Tracker/TrackerDetDescr/TrackerGeoModelUtils/CMakeLists.txt @@ -22,7 +22,7 @@ atlas_depends_on_subdirs( PUBLIC find_package( Boost COMPONENTS filesystem thread system ) find_package( CLHEP ) find_package( CORAL COMPONENTS CoralBase CoralKernel RelationalAccess ) -find_package( GeoModel ) +find_package( GeoModelCore ) # Component(s) in the package: atlas_add_library( TrackerGeoModelUtils diff --git a/Tracker/TrackerDetDescr/TrackerReadoutGeometry/CMakeLists.txt b/Tracker/TrackerDetDescr/TrackerReadoutGeometry/CMakeLists.txt index 13dbf391..a36752e3 100644 --- a/Tracker/TrackerDetDescr/TrackerReadoutGeometry/CMakeLists.txt +++ b/Tracker/TrackerDetDescr/TrackerReadoutGeometry/CMakeLists.txt @@ -31,7 +31,7 @@ atlas_depends_on_subdirs( PUBLIC # External dependencies: find_package( CLHEP ) find_package( Eigen ) -find_package( GeoModel ) +find_package( GeoModelCore ) # Component(s) in the package: atlas_add_library( TrackerReadoutGeometry diff --git a/graphics/VTI12/VTI12Systems/VTI12GeometrySystems/CMakeLists.txt b/graphics/VTI12/VTI12Systems/VTI12GeometrySystems/CMakeLists.txt index 8224c45f..cc9c9d37 100644 --- a/graphics/VTI12/VTI12Systems/VTI12GeometrySystems/CMakeLists.txt +++ b/graphics/VTI12/VTI12Systems/VTI12GeometrySystems/CMakeLists.txt @@ -26,7 +26,7 @@ atlas_depends_on_subdirs( find_package( CLHEP ) find_package( Coin3D ) find_package( Qt5 COMPONENTS Core Gui Widgets Sql ) -find_package( GeoModel ) +find_package( GeoModelCore ) if( APPLE ) find_package(OpenGL REQUIRED) endif() diff --git a/graphics/VTI12/VTI12Systems/VTI12TrackSystems/CMakeLists.txt b/graphics/VTI12/VTI12Systems/VTI12TrackSystems/CMakeLists.txt index 69cf2097..578bdd14 100644 --- a/graphics/VTI12/VTI12Systems/VTI12TrackSystems/CMakeLists.txt +++ b/graphics/VTI12/VTI12Systems/VTI12TrackSystems/CMakeLists.txt @@ -59,7 +59,7 @@ find_package( CLHEP ) find_package( Coin3D ) find_package( HepMC ) find_package( Qt5 COMPONENTS Core Gui Widgets ) -find_package( GeoModel ) +find_package( GeoModelCore ) # Generate UI files automatically: # Note: add the "Widgets" component to "find_package( Qt5 ...)" if you have UI files, otherwise UIC, even if CMAKE_AUTOUIC is set to ON, is not run diff --git a/graphics/VTI12/VTI12Utils/CMakeLists.txt b/graphics/VTI12/VTI12Utils/CMakeLists.txt index af07e3ed..bf13d444 100644 --- a/graphics/VTI12/VTI12Utils/CMakeLists.txt +++ b/graphics/VTI12/VTI12Utils/CMakeLists.txt @@ -39,7 +39,7 @@ find_package( Coin3D ) find_package( Eigen ) find_package( HepPDT ) find_package( Qt5 COMPONENTS Core REQUIRED) -find_package( GeoModel ) +find_package( GeoModelCore ) # Generate MOC files automatically: set( CMAKE_AUTOMOC ON ) -- GitLab