CMakeLists updates in AtlasGeometryCommon

Updated AtlasGeometryCommon packages to use FindGeoModel.cmake. Which was introduced
to serve the new GeoModel uni-project, which was introduced into our build with !39900.

Bonus:
 * Turned CavernInfraGeoModel into component-only package
 * Removed several commented-out include statements from VP1DetInfo.cxx

AtlasGeometryCommon/BeamPipeGeoModel/CMakeLists.txt

-# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
+# Copyright (C) 2002-2021 CERN for the benefit of the ATLAS collaboration
 
 # Declare the package name:
 atlas_subdir( BeamPipeGeoModel )
 
 # External dependencies:
-find_package( GeoModelCore )
+find_package( GeoModel COMPONENTS GeoModelKernel )
 
 # Component(s) in the package:
 atlas_add_library( BeamPipeGeoModelLib
                    src/*.cxx
                    PUBLIC_HEADERS BeamPipeGeoModel
-                   LINK_LIBRARIES ${GEOMODELCORE_LIBRARIES} AthenaKernel GeoModelUtilities
+		   INCLUDE_DIRS ${GEOMODEL_INCLUDE_DIRS}
+                   LINK_LIBRARIES ${GEOMODEL_LIBRARIES} AthenaKernel GeoModelUtilities
                    PRIVATE_LINK_LIBRARIES GaudiKernel GeoModelInterfaces RDBAccessSvcLib SGTools StoreGateLib )
 
 atlas_add_component( BeamPipeGeoModel

AtlasGeometryCommon/CavernInfraGeoModel/CMakeLists.txt

-# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
+# Copyright (C) 2002-2021 CERN for the benefit of the ATLAS collaboration
 
 # Declare the package name:
 atlas_subdir( CavernInfraGeoModel )
 
 # External dependencies:
-find_package( GeoModelCore )
+find_package( GeoModel COMPONENTS GeoModelKernel )
 
 # Component(s) in the package:
-atlas_add_library( CavernInfraGeoModelLib
-                   CavernInfraGeoModel/*.h
-                   INTERFACE
-                   PUBLIC_HEADERS CavernInfraGeoModel
-                   INCLUDE_DIRS ${GEOMODELCORE_INCLUDE_DIRS}
-                   LINK_LIBRARIES ${GEOMODELCORE_LIBRARIES} AthenaKernel )
-
 atlas_add_component( CavernInfraGeoModel
                      src/*.cxx
                      src/components/*.cxx
-                     LINK_LIBRARIES CavernInfraGeoModelLib GaudiKernel GeoModelInterfaces GeoModelUtilities RDBAccessSvcLib StoreGateLib )
+                     INCLUDE_DIRS ${GEOMODEL_INCLUDE_DIRS}	
+                     LINK_LIBRARIES ${GEOMODEL_LIBRARIES} AthenaKernel GaudiKernel GeoModelInterfaces GeoModelUtilities RDBAccessSvcLib StoreGateLib )

AtlasGeometryCommon/CavernInfraGeoModel/src/CavernInfraDetectorFactory.h

@@ -6,7 +6,7 @@
 #define CavernInfraDetectorFactory_h 1
 
 #include "GeoModelKernel/GeoVDetectorFactory.h"
-#include "CavernInfraGeoModel/CavernInfraDetectorManager.h"
+#include "CavernInfraDetectorManager.h"
 #include "RDBAccessSvc/IRDBAccessSvc.h"
 #include <string>
 

AtlasGeometryCommon/CavernInfraGeoModel/src/CavernInfraDetectorFactory01.h

@@ -6,7 +6,7 @@
 #define CavernInfraDetectorFactory01_h 1
 
 #include "GeoModelKernel/GeoVDetectorFactory.h"
-#include "CavernInfraGeoModel/CavernInfraDetectorManager.h"
+#include "CavernInfraDetectorManager.h"
 #include "RDBAccessSvc/IRDBAccessSvc.h"
 #include <string>
 

AtlasGeometryCommon/CavernInfraGeoModel/src/CavernInfraDetectorManager.cxx

 /*
-  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2021 CERN for the benefit of the ATLAS collaboration
 */
 
-#include "CavernInfraGeoModel/CavernInfraDetectorManager.h"
+#include "CavernInfraDetectorManager.h"
 
 CavernInfraDetectorManager::CavernInfraDetectorManager()
 {

AtlasGeometryCommon/CavernInfraGeoModel/src/CavernInfraDetectorTool.cxx

@@ -5,7 +5,7 @@
 #include "CavernInfraDetectorTool.h"
 #include "CavernInfraDetectorFactory.h" 
 #include "CavernInfraDetectorFactory01.h" 
-#include "CavernInfraGeoModel/CavernInfraDetectorManager.h" 
+#include "CavernInfraDetectorManager.h" 
 
 #include "GeoModelInterfaces/IGeoDbTagSvc.h"
 #include "GeoModelUtilities/GeoModelExperiment.h"

AtlasGeometryCommon/GeoModelEnvelopes/CMakeLists.txt

-# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
+# Copyright (C) 2002-2021 CERN for the benefit of the ATLAS collaboration
 
 # Declare the package name:
 atlas_subdir( GeoModelEnvelopes )
 
 # External dependencies:
-find_package( GeoModelCore )
+find_package( GeoModel COMPONENTS GeoModelKernel )
 
 # Component(s) in the package:
 atlas_add_component( GeoModelEnvelopes
                      src/*.cxx
                      src/components/*.cxx
-                     LINK_LIBRARIES ${GEOMODELCORE_LIBRARIES} AthenaKernel GaudiKernel GeoModelInterfaces GeoModelUtilities SGTools StoreGateLib )
+                     LINK_LIBRARIES ${GEOMODEL_LIBRARIES} AthenaKernel GaudiKernel GeoModelInterfaces GeoModelUtilities SGTools StoreGateLib )

graphics/VP1/VP1Utils/src/VP1DetInfo.cxx

@@ -24,7 +24,6 @@
 #include "TRT_ReadoutGeometry/TRT_DetectorManager.h"
 #include "PixelReadoutGeometry/PixelDetectorManager.h"
 #include "SCT_ReadoutGeometry/SCT_DetectorManager.h"
-//#include "InDetServMatGeoModel/InDetServMatManager.h"
 #include "MuonReadoutGeometry/MuonDetectorManager.h"
 #include "LArReadoutGeometry/EMBDetectorManager.h"
 #include "LArReadoutGeometry/HECDetectorManager.h"
@@ -32,9 +31,6 @@
 #include "LArReadoutGeometry/LArDetectorManager.h"
 #include "LArReadoutGeometry/FCALDetectorManager.h"
 #include "TileDetDescr/TileDetDescrManager.h"
-//#include "LUCID_GeoModel/LUCID_GeoModel/LUCID_DetectorManager.h"
-//#include "BeamPipeGeoModel/BeamPipeDetectorManager.h"
-//#include "CavernInfraGeoModel/CavernInfraDetectorManager.h"
 #include "CaloTTDetDescr/CaloTTDescrManager.h"
 #include "CaloIdentifier/CaloIdManager.h"