Merge branch 'FurtherSimDigiCMakeListsUpdates_master' into 'master'

Further CMakeLists.txt tidying for Simulation and Digitization packages

See merge request atlas/athena!34723

Control/PileUpComps/CMakeLists.txt

@@ -5,18 +5,6 @@
 # Declare the package name:
 atlas_subdir( PileUpComps )
 
-# Declare the package's dependencies:
-atlas_depends_on_subdirs( PRIVATE
-                          Control/AthenaBaseComps
-                          Control/AthenaKernel
-                          Control/PileUpTools
-                          Control/StoreGate
-                          Event/EventInfo
-                          Event/EventInfoUtils
-                          Event/xAOD/xAODEventInfo
-                          Event/xAOD/xAODCnvInterfaces
-                          GaudiKernel )
-
 # External dependencies:
 find_package( Boost COMPONENTS filesystem thread system )
 find_package( CLHEP )

Control/PileUpTools/CMakeLists.txt

@@ -5,18 +5,6 @@
 # Declare the package name:
 atlas_subdir( PileUpTools )
 
-# Declare the package's dependencies:
-atlas_depends_on_subdirs( PUBLIC
-                          Control/AthenaBaseComps
-                          Control/AthenaKernel
-                          Control/AthLinks
-                          Control/SGTools
-                          Control/StoreGate
-                          Event/EventInfo
-                          Event/xAOD/xAODEventInfo
-                          Event/xAOD/xAODCnvInterfaces
-                          GaudiKernel )
-
 # Component(s) in the package:
 atlas_add_library( PileUpToolsLib
                    src/*.cxx
@@ -24,7 +12,7 @@ atlas_add_library( PileUpToolsLib
                    LINK_LIBRARIES AthenaBaseComps AthenaKernel
                    AthLinks SGTools
                    EventInfo xAODEventInfo xAODCnvInterfaces
-                   GaudiKernel StoreGateLib SGtests ) 
+                   GaudiKernel StoreGateLib SGtests )
 
 atlas_add_component( PileUpTools
                      src/components/*.cxx

ForwardDetectors/AFP/AFP_Digitization/CMakeLists.txt

@@ -5,19 +5,6 @@
 # Declare the package name:
 atlas_subdir( AFP_Digitization )
 
-# Declare the package's dependencies:
-atlas_depends_on_subdirs( PUBLIC
-                          Control/AthenaBaseComps
-                          Control/AthenaKernel
-                          Control/PileUpTools
-                          Event/xAOD/xAODEventInfo
-                          ForwardDetectors/AFP/AFP_DigiEv
-                          ForwardDetectors/AFP/AFP_SimEv
-                          GaudiKernel
-                          Simulation/HitManagement
-                          PRIVATE
-                          DetectorDescription/Identifier )
-
 # External dependencies:
 find_package( CLHEP )
 find_package( ROOT COMPONENTS Core Tree MathCore Hist RIO pthread )
@@ -30,7 +17,6 @@ atlas_add_component( AFP_Digitization
                      LINK_LIBRARIES ${ROOT_LIBRARIES} ${CLHEP_LIBRARIES} AthenaBaseComps AthenaKernel PileUpToolsLib xAODEventInfo AFP_DigiEv AFP_SimEv GaudiKernel HitManagement Identifier )
 
 # Install files from the package:
-atlas_install_headers( AFP_Digitization )
 atlas_install_python_modules( python/*.py )
 atlas_install_joboptions( share/*.py )
 

ForwardDetectors/ALFA/ALFA_Digitization/CMakeLists.txt

@@ -5,21 +5,6 @@
 # Declare the package name:
 atlas_subdir( ALFA_Digitization )
 
-# Declare the package's dependencies:
-atlas_depends_on_subdirs( PUBLIC
-                          Control/AthenaBaseComps
-                          Control/AthenaKernel
-                          Control/PileUpTools
-                          ForwardDetectors/ALFA/ALFA_RawEv
-                          ForwardDetectors/ALFA/ALFA_SimEv
-                          GaudiKernel
-                          Simulation/HitManagement
-                          PRIVATE
-                          DetectorDescription/Identifier
-                          Generators/GeneratorObjects
-                          Generators/AtlasHepMC
-                          Tools/PathResolver )
-
 # External dependencies:
 find_package( CLHEP )
 find_package( ROOT COMPONENTS Core Tree MathCore Hist RIO pthread )
@@ -28,11 +13,10 @@ find_package( ROOT COMPONENTS Core Tree MathCore Hist RIO pthread )
 atlas_add_component( ALFA_Digitization
                      src/*.cxx
                      src/components/*.cxx
-                     INCLUDE_DIRS ${ROOT_INCLUDE_DIRS} ${CLHEP_INCLUDE_DIRS} 
+                     INCLUDE_DIRS ${ROOT_INCLUDE_DIRS} ${CLHEP_INCLUDE_DIRS}
                      LINK_LIBRARIES ${ROOT_LIBRARIES} ${CLHEP_LIBRARIES} AtlasHepMCLib AthenaBaseComps AthenaKernel PileUpToolsLib ALFA_RawEv ALFA_SimEv GaudiKernel HitManagement Identifier GeneratorObjects PathResolver )
 
 # Install files from the package:
-atlas_install_headers( ALFA_Digitization )
 atlas_install_python_modules( python/*.py )
 atlas_install_joboptions( share/*.py )
 atlas_install_runtime( xtalk/*.txt )

ForwardDetectors/LUCID/LUCID_Digitization/CMakeLists.txt

@@ -5,18 +5,6 @@
 # Declare the package name:
 atlas_subdir( LUCID_Digitization )
 
-# Declare the package's dependencies:
-atlas_depends_on_subdirs( PRIVATE
-                          Control/AthenaBaseComps
-                          Control/AthenaKernel
-                          Control/PileUpTools
-                          Event/xAOD/xAODEventInfo
-                          ForwardDetectors/LUCID/LUCID_RawEvent
-                          ForwardDetectors/LUCID/LUCID_SimUtils/LUCID_SimEvent
-                          GaudiKernel
-                          Generators/GeneratorObjects
-                          Simulation/HitManagement )
-
 # External dependencies:
 find_package( CLHEP )
 find_package( ROOT COMPONENTS Core Tree MathCore Hist RIO pthread )

ForwardDetectors/ZDC/ZDC_SimuDigitization/CMakeLists.txt

@@ -5,18 +5,6 @@
 # Declare the package name:
 atlas_subdir( ZDC_SimuDigitization )
 
-# Declare the package's dependencies:
-atlas_depends_on_subdirs( PUBLIC
-                          Control/AthenaBaseComps
-                          Control/AthenaKernel
-                          Control/PileUpTools
-                          ForwardDetectors/ZDC/ZDC_SimEvent
-                          ForwardDetectors/ZDC/ZdcEvent
-                          GaudiKernel
-                          Simulation/HitManagement
-                          PRIVATE
-                          DetectorDescription/Identifier )
-
 # External dependencies:
 find_package( CLHEP )
 
@@ -28,7 +16,6 @@ atlas_add_component( ZDC_SimuDigitization
                      LINK_LIBRARIES ${CLHEP_LIBRARIES} AthenaBaseComps AthenaKernel PileUpToolsLib ZDC_SimEvent ZdcEvent GaudiKernel HitManagement Identifier )
 
 # Install files from the package:
-atlas_install_headers( ZDC_SimuDigitization )
 atlas_install_python_modules( python/*.py )
 atlas_install_joboptions( share/*.py )
 

Simulation/FastShower/FastCaloSim/CMakeLists.txt

@@ -46,13 +46,12 @@ atlas_add_library( FastCaloSimLib
                    INCLUDE_DIRS ${ROOT_INCLUDE_DIRS} ${HEPPDT_INCLUDE_DIRS} 
                    PRIVATE_INCLUDE_DIRS ${CLHEP_INCLUDE_DIRS}  ${EIGEN_INCLUDE_DIRS} ${Boost_INCLUDE_DIRS}
                    PRIVATE_DEFINITIONS ${CLHEP_DEFINITIONS}
-                   LINK_LIBRARIES ${ROOT_LIBRARIES} ${HEPPDT_LIBRARIES} CaloEvent CaloIdentifier CaloInterfaceLib AthenaBaseComps AthenaKernel FastCaloSimAthenaPool FastSimulationEventLib Identifier GaudiKernel LArRecEvent TileEvent TrkEventPrimitives TrkParameters TrkExInterfaces CaloDetDescrLib StoreGateLib SGtests
-                   PRIVATE_LINK_LIBRARIES ${CLHEP_LIBRARIES} ${Boost_LIBRARIES} AtlasHepMCLib ${EIGEN_LIBRARIES} AthAllocators AthenaPoolUtilities AtlasDetDescr DetDescrCondToolsLib GeoPrimitives EventKernel NavFourMom GeneratorObjects TruthUtils PathResolver TrkGeometry TrkSurfaces TrkMaterialOnTrack )
+                   LINK_LIBRARIES ${ROOT_LIBRARIES} ${HEPPDT_LIBRARIES} AtlasHepMCLib CaloEvent CaloIdentifier CaloInterfaceLib AthenaBaseComps AthenaKernel FastCaloSimAthenaPool FastSimulationEventLib GeneratorObjects Identifier GaudiKernel LArRecEvent TileEvent TrkEventPrimitives TrkParameters TrkExInterfaces CaloDetDescrLib StoreGateLib SGtests
+                   PRIVATE_LINK_LIBRARIES ${CLHEP_LIBRARIES} ${Boost_LIBRARIES} ${EIGEN_LIBRARIES} AthAllocators AthenaPoolUtilities AtlasDetDescr DetDescrCondToolsLib GeoPrimitives EventKernel NavFourMom TruthUtils PathResolver TrkGeometry TrkSurfaces TrkMaterialOnTrack )
 
 atlas_add_component( FastCaloSim
                      src/components/*.cxx
-                     INCLUDE_DIRS ${ROOT_INCLUDE_DIRS} ${HEPPDT_INCLUDE_DIRS} ${CLHEP_INCLUDE_DIRS}  ${EIGEN_INCLUDE_DIRS}
-                     LINK_LIBRARIES ${ROOT_LIBRARIES} ${HEPPDT_LIBRARIES} ${CLHEP_LIBRARIES} AtlasHepMCLib ${EIGEN_LIBRARIES} CaloDetDescrLib CaloEvent CaloIdentifier AthenaBaseComps AthenaKernel StoreGateLib SGtests Identifier GaudiKernel LArRecEvent TileEvent TrkEventPrimitives TrkParameters TrkExInterfaces AthAllocators AthenaPoolUtilities AtlasDetDescr GeoPrimitives EventKernel NavFourMom GeneratorObjects TruthUtils FastCaloSimAthenaPool PathResolver TrkGeometry TrkSurfaces TrkMaterialOnTrack FastCaloSimLib )
+                     LINK_LIBRARIES FastCaloSimLib )
 
 # Install files from the package:
 atlas_install_python_modules( python/*.py )

Simulation/FastShower/FastCaloSimHit/CMakeLists.txt

@@ -23,7 +23,7 @@ atlas_add_library( FastCaloSimHitLib
 
 atlas_add_component( FastCaloSimHit
                      src/components/*.cxx
-                     LINK_LIBRARIES AthenaBaseComps StoreGateLib SGtests GaudiKernel LArSimEvent TileSimEvent CaloEvent CaloIdentifier PileUpToolsLib EventInfo TileConditionsLib TileEvent FastCaloSimHitLib )
+                     LINK_LIBRARIES FastCaloSimHitLib )
 
 # Install files from the package:
 atlas_install_python_modules( python/*.py POST_BUILD_CMD ${ATLAS_FLAKE8} )

Simulation/G4Atlas/G4AtlasTools/CMakeLists.txt

@@ -25,8 +25,7 @@ atlas_add_library( G4AtlasToolsLib
 
 atlas_add_component( G4AtlasTools
                      src/components/*.cxx
-                     INCLUDE_DIRS ${Boost_INCLUDE_DIRS} ${XERCESC_INCLUDE_DIRS} ${GEANT4_INCLUDE_DIRS} ${CLHEP_INCLUDE_DIRS} ${TBB_INCLUDE_DIRS}
-                     LINK_LIBRARIES ${Boost_LIBRARIES} ${XERCESC_LIBRARIES} ${GEANT4_LIBRARIES} ${CLHEP_LIBRARIES} ${TBB_LIBRARIES} AthenaBaseComps G4AtlasInterfaces GaudiKernel G4AtlasToolsLib )
+                     LINK_LIBRARIES G4AtlasToolsLib )
 
 #testing just the simulation parts, no forward detectors or region
 atlas_add_test( G4GeometryToolConfig_Simtest

Simulation/G4Sim/MCTruthBase/CMakeLists.txt

@@ -14,9 +14,9 @@ find_package( XercesC )
 atlas_add_library( MCTruthBaseLib
                    src/*.cxx
                    PUBLIC_HEADERS MCTruthBase
-                   INCLUDE_DIRS ${GEANT4_INCLUDE_DIRS} ${XERCESC_INCLUDE_DIRS} ${CLHEP_INCLUDE_DIRS} 
+                   INCLUDE_DIRS ${GEANT4_INCLUDE_DIRS} ${XERCESC_INCLUDE_DIRS} ${CLHEP_INCLUDE_DIRS}
                    DEFINITIONS ${CLHEP_DEFINITIONS}
-                   LINK_LIBRARIES ${GEANT4_LIBRARIES} ${XERCESC_LIBRARIES} ${CLHEP_LIBRARIES} AtlasHepMCLib AthenaKernel GaudiKernel StoreGateLib SGtests G4AtlasToolsLib
+                   LINK_LIBRARIES ${GEANT4_LIBRARIES} ${XERCESC_LIBRARIES} ${CLHEP_LIBRARIES} AtlasHepMCLib AthenaKernel GaudiKernel StoreGateLib SGtests G4AtlasToolsLib TrackRecordLib
                    PRIVATE_LINK_LIBRARIES AthenaBaseComps
                    G4AtlasInterfaces MCTruth SimHelpers ISF_InterfacesLib
                    AtlasDetDescr ISF_Geant4Event
@@ -24,15 +24,7 @@ atlas_add_library( MCTruthBaseLib
 
 atlas_add_component( MCTruthBase
                      src/components/*.cxx
-                     INCLUDE_DIRS ${GEANT4_INCLUDE_DIRS} ${XERCESC_INCLUDE_DIRS} ${CLHEP_INCLUDE_DIRS} 
-                     LINK_LIBRARIES ${GEANT4_LIBRARIES}
-                     ${XERCESC_LIBRARIES} ${CLHEP_LIBRARIES}
-                     AtlasHepMCLib AthenaKernel GaudiKernel
-                     AthenaBaseComps StoreGateLib SGtests
-                     G4AtlasInterfaces G4AtlasToolsLib MCTruth
-                     SimHelpers ISF_InterfacesLib
-                     AtlasDetDescr MCTruthBaseLib
-                     ISF_Geant4Event )
+                     LINK_LIBRARIES MCTruthBaseLib )
 
 # Install files from the package:
 atlas_install_python_modules( python/*.py )

Simulation/G4Utilities/G4ProfilingTools/CMakeLists.txt

@@ -27,8 +27,7 @@ atlas_add_library( G4ProfilingToolsLib
 
 atlas_add_component( G4ProfilingTools
                      src/components/*.cxx
-                     INCLUDE_DIRS ${Boost_INCLUDE_DIRS} ${ROOT_INCLUDE_DIRS} ${XERCESC_INCLUDE_DIRS} ${GEANT4_INCLUDE_DIRS} ${CLHEP_INCLUDE_DIRS}
-                     LINK_LIBRARIES ${Boost_LIBRARIES} ${ROOT_LIBRARIES} ${XERCESC_LIBRARIES} ${GEANT4_LIBRARIES} ${CLHEP_LIBRARIES} GaudiKernel AthenaKernel G4AtlasToolsLib G4ProfilingToolsLib )
+                     LINK_LIBRARIES G4ProfilingToolsLib )
 
 # Install files from the package:
 atlas_install_python_modules( python/*.py )

Simulation/G4Utilities/MCTruthAlgs/CMakeLists.txt

@@ -21,8 +21,7 @@ atlas_add_library( MCTruthAlgsLib
 
 atlas_add_component( MCTruthAlgs
                      src/components/*.cxx
-                     INCLUDE_DIRS ${HEPPDT_INCLUDE_DIRS} ${CLHEP_INCLUDE_DIRS}
-                     LINK_LIBRARIES ${HEPPDT_LIBRARIES} ${CLHEP_LIBRARIES} AthenaBaseComps GaudiKernel MCTruthAlgsLib )
+                     LINK_LIBRARIES MCTruthAlgsLib )
 
 # Install files from the package:
 atlas_install_joboptions( share/*.py )

Simulation/G4Utilities/TrackWriteFastSim/CMakeLists.txt

@@ -22,8 +22,7 @@ atlas_add_library( TrackWriteFastSimLib
 
 atlas_add_component( TrackWriteFastSim
                      src/components/*.cxx
-                     INCLUDE_DIRS ${GEANT4_INCLUDE_DIRS} ${XERCESC_INCLUDE_DIRS} ${CLHEP_INCLUDE_DIRS}
-                     LINK_LIBRARIES ${GEANT4_LIBRARIES} ${XERCESC_LIBRARIES} ${CLHEP_LIBRARIES} StoreGateLib SGtests GaudiKernel G4AtlasInterfaces G4AtlasToolsLib MCTruth TrackWriteFastSimLib )
+                     LINK_LIBRARIES TrackWriteFastSimLib )
 
 # Install files from the package:
 atlas_install_python_modules( python/*.py )

Simulation/ISF/ISF_Fatras/ISF_FatrasDetDescrTools/CMakeLists.txt

@@ -19,8 +19,7 @@ atlas_add_library( ISF_FatrasDetDescrToolsLib
 
 atlas_add_component( ISF_FatrasDetDescrTools
                      src/components/*.cxx
-                     INCLUDE_DIRS ${ROOT_INCLUDE_DIRS} ${EIGEN_INCLUDE_DIRS}
-                     LINK_LIBRARIES ${ROOT_LIBRARIES} ${EIGEN_LIBRARIES} AthenaBaseComps GeoPrimitives GaudiKernel ISF_FatrasDetDescrInterfaces ISF_FatrasDetDescrModel TrkDetDescrInterfaces TrkDetDescrUtils TrkSurfaces StoreGateLib SGtests InDetIdentifier InDetReadoutGeometry TrkGeometry TrkVolumes ISF_FatrasDetDescrToolsLib )
+                     LINK_LIBRARIES ISF_FatrasDetDescrToolsLib )
 
 # Install files from the package:
 atlas_install_python_modules( python/*.py POST_BUILD_CMD ${ATLAS_FLAKE8} )

Simulation/Tools/McEventCollectionFilter/CMakeLists.txt

@@ -15,12 +15,11 @@ atlas_add_library( McEventCollectionFilterLib
                    NO_PUBLIC_HEADERS
                    PRIVATE_INCLUDE_DIRS ${CLHEP_INCLUDE_DIRS}  ${EIGEN_INCLUDE_DIRS}
                    PRIVATE_DEFINITIONS ${CLHEP_DEFINITIONS}
-                   LINK_LIBRARIES StoreGateLib SGtests
-                   PRIVATE_LINK_LIBRARIES ${CLHEP_LIBRARIES} AtlasHepMCLib ${EIGEN_LIBRARIES} AthenaBaseComps GeoPrimitives GaudiKernel GeneratorObjects InDetSimEvent MuonSimEvent )
+                   LINK_LIBRARIES AthenaBaseComps GeneratorObjects InDetSimEvent MuonSimEvent StoreGateLib SGtests
+                   PRIVATE_LINK_LIBRARIES ${CLHEP_LIBRARIES} AtlasHepMCLib ${EIGEN_LIBRARIES} GeoPrimitives GaudiKernel )
 
 atlas_add_component( McEventCollectionFilter
                      src/components/*.cxx
-                     INCLUDE_DIRS ${CLHEP_INCLUDE_DIRS}  ${EIGEN_INCLUDE_DIRS}
-                     LINK_LIBRARIES ${CLHEP_LIBRARIES} AtlasHepMCLib ${EIGEN_LIBRARIES} AthenaBaseComps StoreGateLib SGtests GeoPrimitives GaudiKernel GeneratorObjects InDetSimEvent MuonSimEvent McEventCollectionFilterLib )
+                     LINK_LIBRARIES McEventCollectionFilterLib )
 
 atlas_install_python_modules( python/*.py )