Merge branch 'SimulationCMakeListsTidying3_master' into 'master'

Clean-up of Geo2G4/CmakeLists.txt

See merge request atlas/athena!34768

Simulation/G4Utilities/Geo2G4/CMakeLists.txt

@@ -17,20 +17,17 @@ find_package( GeoModelCore )
 atlas_add_library( Geo2G4Lib
                    src/*.cxx
                    NO_PUBLIC_HEADERS
-                   INCLUDE_DIRS ${XERCESC_INCLUDE_DIRS} ${GEANT4_INCLUDE_DIRS} ${ROOT_INCLUDE_DIRS}
-                   PRIVATE_INCLUDE_DIRS ${Boost_INCLUDE_DIRS} ${CLHEP_INCLUDE_DIRS} ${GEOMODELCORE_INCLUDE_DIRS}
+                   INCLUDE_DIRS ${XERCESC_INCLUDE_DIRS} ${GEANT4_INCLUDE_DIRS} ${ROOT_INCLUDE_DIRS} ${GEOMODELCORE_INCLUDE_DIRS}
+                   PRIVATE_INCLUDE_DIRS ${Boost_INCLUDE_DIRS} ${CLHEP_INCLUDE_DIRS}
                    PRIVATE_DEFINITIONS ${CLHEP_DEFINITIONS}
-                   LINK_LIBRARIES ${XERCESC_LIBRARIES} ${GEANT4_LIBRARIES} ${ROOT_LIBRARIES} GaudiKernel
-                   PRIVATE_LINK_LIBRARIES ${Boost_LIBRARIES} ${CLHEP_LIBRARIES} ${GEOMODELCORE_LIBRARIES} AthenaBaseComps GeoSpecialShapes G4AtlasToolsLib SimHelpers GeoMaterial2G4 AthenaKernel GeoModelInterfaces GeoModelUtilities StoreGateLib SGtests GeoPrimitives )
+                   LINK_LIBRARIES ${XERCESC_LIBRARIES} ${GEANT4_LIBRARIES} ${GEOMODELCORE_LIBRARIES} ${ROOT_LIBRARIES} AthenaBaseComps GaudiKernel G4AtlasInterfaces G4AtlasToolsLib GeoModelUtilities GeoPrimitives
+                   PRIVATE_LINK_LIBRARIES ${Boost_LIBRARIES} ${CLHEP_LIBRARIES} GeoSpecialShapes SimHelpers GeoMaterial2G4 AthenaKernel GeoModelInterfaces StoreGateLib SGtests )
 
 atlas_add_component( Geo2G4
                      src/components/*.cxx
-                     INCLUDE_DIRS ${Boost_INCLUDE_DIRS} ${XERCESC_INCLUDE_DIRS} ${GEANT4_INCLUDE_DIRS} ${ROOT_INCLUDE_DIRS} ${CLHEP_INCLUDE_DIRS} ${GEOMODELCORE_INCLUDE_DIRS}
-                     LINK_LIBRARIES ${Boost_LIBRARIES} ${XERCESC_LIBRARIES} ${GEANT4_LIBRARIES} ${ROOT_LIBRARIES} ${CLHEP_LIBRARIES} ${GEOMODELCORE_LIBRARIES} AthenaKernel GeoModelUtilities GaudiKernel AthenaBaseComps StoreGateLib SGtests GeoSpecialShapes G4AtlasToolsLib SimHelpers GeoMaterial2G4 Geo2G4Lib )
+                     LINK_LIBRARIES Geo2G4Lib )
 
 atlas_add_dictionary( LArWheelSolidCheckerDict
                       src/LArWheelSolidDDProxy.h
                       src/lcg_dict/selection.xml
-                      INCLUDE_DIRS ${Boost_INCLUDE_DIRS} ${XERCESC_INCLUDE_DIRS} ${GEANT4_INCLUDE_DIRS} ${ROOT_INCLUDE_DIRS} ${CLHEP_INCLUDE_DIRS} ${GEOMODELCORE_INCLUDE_DIRS}
-                      LINK_LIBRARIES ${Boost_LIBRARIES} ${XERCESC_LIBRARIES} ${GEANT4_LIBRARIES} ${ROOT_LIBRARIES} ${CLHEP_LIBRARIES} ${GEOMODELCORE_LIBRARIES} AthenaKernel GeoModelUtilities GaudiKernel AthenaBaseComps StoreGateLib SGtests GeoSpecialShapes SimHelpers GeoMaterial2G4 Geo2G4Lib )
-
+                      LINK_LIBRARIES Geo2G4Lib )

Simulation/G4Utilities/Geo2G4/src/Geo2G4AssemblyFactory.h

 /*
-  Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
 */
 
 #ifndef GEO2G4_Geo2G4AssemblyFactory_h
 #define GEO2G4_Geo2G4AssemblyFactory_h
 
 #include "GeoModelKernel/GeoVPhysVol.h"
-#include "Geo2G4AssemblyFactory.h"
 
 #include <map>
 #include <memory>
 
 class Geo2G4AssemblyVolume;
 
-class Geo2G4AssemblyFactory 
+class Geo2G4AssemblyFactory
 {
  public:
   Geo2G4AssemblyFactory();
   Geo2G4AssemblyVolume* Build(const PVConstLink thePhys,
-			                  bool& descend);
- 
+                                          bool& descend);
+
  private:
   std::map<const GeoVPhysVol*, std::unique_ptr<Geo2G4AssemblyVolume>, std::less<const GeoVPhysVol*> > m_assemblyMap;
 };

Simulation/G4Utilities/Geo2G4/src/Geo2G4Svc.cxx

@@ -3,6 +3,7 @@
 */
 
 #include "Geo2G4Svc.h"
+#include "Geo2G4AssemblyVolume.h"
 #include "ExtParameterisedVolumeBuilder.h"
 
 // separate function not part of this class (why?)

Simulation/G4Utilities/Geo2G4/src/Geo2G4Svc.h

 /*
-  Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
 */
 
 #ifndef GEO2G4_Geo2G4Svc_H
@@ -11,7 +11,6 @@
 #include "GaudiKernel/IIncidentListener.h"
 
 #include "Geo2G4AssemblyFactory.h"
-#include "Geo2G4AssemblyVolume.h"
 
 #include "VolumeBuilder.h"