From cf3d9861b89e9ead31d1bc08a2897265334ebfbd Mon Sep 17 00:00:00 2001
From: John Chapman <jchapman@cern.ch>
Date: Fri, 1 May 2020 15:31:42 +0200
Subject: [PATCH] CMakeLists.txt tidying
Add missing installed libraries for interfaces and adapt other packages to use
interface libraries.
---
.../InDetSimUtils/TRT_TR_Process/CMakeLists.txt | 2 +-
LArCalorimeter/LArG4/LArG4EC/CMakeLists.txt | 2 +-
LArCalorimeter/LArG4/LArG4FCAL/CMakeLists.txt | 2 +-
.../LArG4/LArG4GenShowerLib/CMakeLists.txt | 4 ++--
LArCalorimeter/LArG4/LArG4H6SD/CMakeLists.txt | 2 +-
LArCalorimeter/LArG4/LArG4HEC/CMakeLists.txt | 4 ++--
LArCalorimeter/LArG4/LArG4MiniFCAL/CMakeLists.txt | 2 +-
LArCalorimeter/LArG4/LArG4ShowerLib/CMakeLists.txt | 4 ++--
Simulation/Barcode/BarcodeEvent/CMakeLists.txt | 6 ++++--
.../Barcode/BarcodeInterfaces/CMakeLists.txt | 7 +++++--
Simulation/Barcode/BarcodeServices/CMakeLists.txt | 2 +-
Simulation/BeamEffects/CMakeLists.txt | 6 ++----
Simulation/FastShower/FastCaloSim/CMakeLists.txt | 4 ++--
.../FastShower/FastCaloSimHit/CMakeLists.txt | 2 +-
.../FastSimulationEvent/CMakeLists.txt | 9 ++++-----
Simulation/G4Atlas/G4AtlasAlg/CMakeLists.txt | 2 +-
Simulation/G4Atlas/G4AtlasTests/CMakeLists.txt | 2 +-
Simulation/G4Atlas/G4AtlasTools/CMakeLists.txt | 2 +-
.../G4Extensions/G4CosmicFilter/CMakeLists.txt | 2 +-
Simulation/G4Sim/MCTruthBase/CMakeLists.txt | 4 ++--
Simulation/G4SimCnv/G4SimTPCnv/CMakeLists.txt | 2 +-
Simulation/G4Utilities/Geo2G4/CMakeLists.txt | 2 +-
Simulation/G4Utilities/MCTruthAlgs/CMakeLists.txt | 2 +-
.../G4Utilities/MCTruthSimAlgs/CMakeLists.txt | 2 +-
.../G4Utilities/TrackWriteFastSim/CMakeLists.txt | 2 +-
.../ISF/ISF_Core/ISF_Algorithms/CMakeLists.txt | 12 +++++++-----
Simulation/ISF/ISF_Core/ISF_Event/CMakeLists.txt | 2 +-
.../ISF/ISF_Core/ISF_Interfaces/CMakeLists.txt | 4 ++--
.../ISF/ISF_Core/ISF_Services/CMakeLists.txt | 10 +++++++---
Simulation/ISF/ISF_Core/ISF_Tools/CMakeLists.txt | 2 +-
.../ISF_FastCaloSimParametrization/CMakeLists.txt | 4 ++--
.../ISF_FastCaloSimSD/CMakeLists.txt | 2 +-
.../ISF_FastCaloSimServices/CMakeLists.txt | 2 +-
.../ISF_PunchThroughTools/CMakeLists.txt | 2 +-
.../ISF_FatrasDetDescrInterfaces/CMakeLists.txt | 2 ++
.../ISF_Fatras/ISF_FatrasInterfaces/CMakeLists.txt | 14 ++------------
.../ISF_Fatras/ISF_FatrasRecoTools/CMakeLists.txt | 2 +-
.../ISF_Fatras/ISF_FatrasServices/CMakeLists.txt | 2 +-
.../ISF/ISF_Fatras/ISF_FatrasTools/CMakeLists.txt | 2 +-
.../ISF_Fatras/ISF_FatrasToolsG4/CMakeLists.txt | 2 +-
.../ISF_Fatras/ISF_FatrasToolsID/CMakeLists.txt | 2 +-
.../ISF_Fatras/ISF_FatrasToolsMS/CMakeLists.txt | 8 ++++----
.../ISF_Geant4CommonServices/CMakeLists.txt | 2 +-
.../ISF_Geant4CommonTools/CMakeLists.txt | 2 +-
.../ISF/ISF_Geant4/ISF_Geant4Event/CMakeLists.txt | 4 ++--
.../ISF_Geant4/ISF_Geant4Services/CMakeLists.txt | 2 +-
.../ISF/ISF_Geant4/ISF_Geant4Tools/CMakeLists.txt | 4 ++--
.../ISF_Geant4UserActions/CMakeLists.txt | 2 +-
.../ISF_HepMC/ISF_HepMC_Interfaces/CMakeLists.txt | 7 +++++--
.../ISF/ISF_HepMC/ISF_HepMC_Tools/CMakeLists.txt | 8 ++++----
.../ISF_ParSimInterfaces/CMakeLists.txt | 8 +++++---
.../ISF_ParSimServices/CMakeLists.txt | 3 +--
.../ISF_ParSimTools/CMakeLists.txt | 3 +--
.../ISF/ISF_SimulationSelectors/CMakeLists.txt | 4 ++--
.../ISF_TrackingInterfaces/CMakeLists.txt | 8 +++++---
.../ISF_Tracking/ISF_TrackingTools/CMakeLists.txt | 2 +-
.../Interfaces/HepMC_Interfaces/CMakeLists.txt | 7 +++++--
Simulation/Overlay/OverlayCopyAlgs/CMakeLists.txt | 13 +------------
Simulation/Tools/HitAnalysis/CMakeLists.txt | 4 ++--
Simulation/TruthJiveXML/CMakeLists.txt | 2 +-
TileCalorimeter/TileFastCaloSim/CMakeLists.txt | 2 +-
.../CombinedScintillator/CMakeLists.txt | 2 +-
.../TileAncillary/DeadMaterial/CMakeLists.txt | 2 +-
.../TileG4/TileAncillary/LarCrate/CMakeLists.txt | 2 +-
.../TileG4/TileAncillary/MuonWall/CMakeLists.txt | 2 +-
.../PhantomCalorimeter/CMakeLists.txt | 2 +-
.../TileG4/TileG4Interfaces/CMakeLists.txt | 8 +++++---
.../TileG4/TileGeoG4Calib/CMakeLists.txt | 2 +-
TileCalorimeter/TileG4/TileGeoG4SD/CMakeLists.txt | 4 ++--
69 files changed, 132 insertions(+), 133 deletions(-)
diff --git a/InnerDetector/InDetSimUtils/TRT_TR_Process/CMakeLists.txt b/InnerDetector/InDetSimUtils/TRT_TR_Process/CMakeLists.txt
index aa5f3c027bc..14297268101 100644
--- a/InnerDetector/InDetSimUtils/TRT_TR_Process/CMakeLists.txt
+++ b/InnerDetector/InDetSimUtils/TRT_TR_Process/CMakeLists.txt
@@ -29,7 +29,7 @@ atlas_add_component( TRT_TR_Process
src/*.cxx
src/components/*.cxx
INCLUDE_DIRS ${Boost_INCLUDE_DIRS} ${XERCESC_INCLUDE_DIRS} ${GEANT4_INCLUDE_DIRS} ${CLHEP_INCLUDE_DIRS}
- LINK_LIBRARIES ${Boost_LIBRARIES} ${XERCESC_LIBRARIES} ${GEANT4_LIBRARIES} ${CLHEP_LIBRARIES} GaudiKernel AthenaBaseComps AthenaKernel StoreGateLib SGtests IdDictDetDescr G4AtlasInterfaces GeoMaterial2G4 PathResolver )
+ LINK_LIBRARIES ${Boost_LIBRARIES} ${XERCESC_LIBRARIES} ${GEANT4_LIBRARIES} ${CLHEP_LIBRARIES} GaudiKernel AthenaBaseComps AthenaKernel StoreGateLib SGtests IdDictDetDescr G4AtlasInterfaces GeoMaterial2G4 GeoModelInterfaces PathResolver )
# Install files from the package:
atlas_install_python_modules( python/*.py )
diff --git a/LArCalorimeter/LArG4/LArG4EC/CMakeLists.txt b/LArCalorimeter/LArG4/LArG4EC/CMakeLists.txt
index 7eb1b312b3b..8c2ae22e392 100644
--- a/LArCalorimeter/LArG4/LArG4EC/CMakeLists.txt
+++ b/LArCalorimeter/LArG4/LArG4EC/CMakeLists.txt
@@ -36,6 +36,6 @@ atlas_add_component( LArG4EC
PRIVATE_INCLUDE_DIRS ${Boost_INCLUDE_DIRS} ${CORAL_INCLUDE_DIRS} ${CLHEP_INCLUDE_DIRS}
PRIVATE_DEFINITIONS ${CLHEP_DEFINITIONS}
LINK_LIBRARIES ${XERCESC_LIBRARIES} ${GEANT4_LIBRARIES} GeoSpecialShapes LArG4Code LArGeoCode CaloG4SimLib StoreGateLib SGtests
- PRIVATE_LINK_LIBRARIES ${Boost_LIBRARIES} ${CORAL_LIBRARIES} ${CLHEP_LIBRARIES} GeoModelUtilities GaudiKernel LArG4RunControl LArHV PathResolver )
+ PRIVATE_LINK_LIBRARIES ${Boost_LIBRARIES} ${CORAL_LIBRARIES} ${CLHEP_LIBRARIES} GeoModelUtilities GaudiKernel LArG4RunControl LArHV PathResolver GeoModelInterfaces RDBAccessSvcLib )
atlas_install_python_modules( python/*.py )
diff --git a/LArCalorimeter/LArG4/LArG4FCAL/CMakeLists.txt b/LArCalorimeter/LArG4/LArG4FCAL/CMakeLists.txt
index 67869fbf1e4..ec920e45366 100644
--- a/LArCalorimeter/LArG4/LArG4FCAL/CMakeLists.txt
+++ b/LArCalorimeter/LArG4/LArG4FCAL/CMakeLists.txt
@@ -31,7 +31,7 @@ atlas_add_component( LArG4FCAL
PRIVATE_INCLUDE_DIRS ${Boost_INCLUDE_DIRS} ${CORAL_INCLUDE_DIRS} ${XERCESC_INCLUDE_DIRS} ${GEANT4_INCLUDE_DIRS} ${CLHEP_INCLUDE_DIRS}
PRIVATE_DEFINITIONS ${CLHEP_DEFINITIONS}
LINK_LIBRARIES LArG4Code LArReadoutGeometry CaloG4SimLib StoreGateLib SGtests
- PRIVATE_LINK_LIBRARIES ${Boost_LIBRARIES} ${CORAL_LIBRARIES} ${XERCESC_LIBRARIES} ${GEANT4_LIBRARIES} ${CLHEP_LIBRARIES} GaudiKernel LArG4RunControl PathResolver )
+ PRIVATE_LINK_LIBRARIES ${Boost_LIBRARIES} ${CORAL_LIBRARIES} ${XERCESC_LIBRARIES} ${GEANT4_LIBRARIES} ${CLHEP_LIBRARIES} GaudiKernel LArG4RunControl PathResolver GeoModelInterfaces RDBAccessSvcLib )
atlas_install_python_modules( python/*.py )
diff --git a/LArCalorimeter/LArG4/LArG4GenShowerLib/CMakeLists.txt b/LArCalorimeter/LArG4/LArG4GenShowerLib/CMakeLists.txt
index 0ea158db1fe..9e731829fbf 100644
--- a/LArCalorimeter/LArG4/LArG4GenShowerLib/CMakeLists.txt
+++ b/LArCalorimeter/LArG4/LArG4GenShowerLib/CMakeLists.txt
@@ -32,8 +32,8 @@ atlas_add_library( LArG4GenShowerLibLib
PUBLIC_HEADERS LArG4GenShowerLib
PRIVATE_INCLUDE_DIRS ${XERCESC_INCLUDE_DIRS} ${GEANT4_INCLUDE_DIRS} ${ROOT_INCLUDE_DIRS} ${CLHEP_INCLUDE_DIRS}
PRIVATE_DEFINITIONS ${CLHEP_DEFINITIONS}
- LINK_LIBRARIES AthenaBaseComps AthContainers GaudiKernel G4AtlasToolsLib
- PRIVATE_LINK_LIBRARIES ${XERCESC_LIBRARIES} ${GEANT4_LIBRARIES} ${ROOT_LIBRARIES} ${CLHEP_LIBRARIES} GeneratorObjects LArG4Code LArG4ShowerLib )
+ LINK_LIBRARIES AthenaBaseComps AthContainers AtlasHepMCLib GaudiKernel G4AtlasToolsLib LArG4Code
+ PRIVATE_LINK_LIBRARIES ${XERCESC_LIBRARIES} ${GEANT4_LIBRARIES} ${ROOT_LIBRARIES} ${CLHEP_LIBRARIES} GeneratorObjects GeoModelInterfaces LArG4ShowerLib )
atlas_add_component( LArG4GenShowerLib
src/components/*.cxx
diff --git a/LArCalorimeter/LArG4/LArG4H6SD/CMakeLists.txt b/LArCalorimeter/LArG4/LArG4H6SD/CMakeLists.txt
index 26673276dba..b0a45222a99 100644
--- a/LArCalorimeter/LArG4/LArG4H6SD/CMakeLists.txt
+++ b/LArCalorimeter/LArG4/LArG4H6SD/CMakeLists.txt
@@ -46,7 +46,7 @@ atlas_add_component( LArG4H6SD
src/*.cc
src/components/*.cxx
INCLUDE_DIRS ${CORAL_INCLUDE_DIRS} ${Boost_INCLUDE_DIRS} ${XERCESC_INCLUDE_DIRS} ${CLHEP_INCLUDE_DIRS} ${GEANT4_INCLUDE_DIRS}
- LINK_LIBRARIES ${CORAL_LIBRARIES} ${Boost_LIBRARIES} ${XERCESC_LIBRARIES} ${CLHEP_LIBRARIES} AtlasHepMCLib ${GEANT4_LIBRARIES} GaudiKernel CaloG4SimLib CaloSimEvent AthenaBaseComps AthenaKernel StoreGateLib SGtests GeoModelUtilities Identifier GeneratorObjects LArG4Code LArG4RunControl LArG4TBSimEvent LArReadoutGeometry LArSimEvent G4AtlasInterfaces G4AtlasToolsLib SimHelpers HitManagement MCTruth TBEvent PathResolver )
+ LINK_LIBRARIES ${CORAL_LIBRARIES} ${Boost_LIBRARIES} ${XERCESC_LIBRARIES} ${CLHEP_LIBRARIES} AtlasHepMCLib ${GEANT4_LIBRARIES} GaudiKernel CaloG4SimLib CaloSimEvent AthenaBaseComps AthenaKernel StoreGateLib SGtests GeoModelUtilities Identifier GeneratorObjects LArG4Code LArG4RunControl LArG4TBSimEvent LArReadoutGeometry LArSimEvent G4AtlasInterfaces G4AtlasToolsLib SimHelpers HitManagement MCTruth TBEvent PathResolver GeoModelInterfaces RDBAccessSvcLib )
# Install files from the package:
atlas_install_python_modules( python/*.py )
diff --git a/LArCalorimeter/LArG4/LArG4HEC/CMakeLists.txt b/LArCalorimeter/LArG4/LArG4HEC/CMakeLists.txt
index ed5aec6204a..77d9a10c62c 100644
--- a/LArCalorimeter/LArG4/LArG4HEC/CMakeLists.txt
+++ b/LArCalorimeter/LArG4/LArG4HEC/CMakeLists.txt
@@ -34,7 +34,7 @@ atlas_add_component( LArG4HEC
INCLUDE_DIRS ${XERCESC_INCLUDE_DIRS} ${GEANT4_INCLUDE_DIRS} ${CLHEP_INCLUDE_DIRS}
PRIVATE_INCLUDE_DIRS ${Boost_INCLUDE_DIRS} ${CORAL_INCLUDE_DIRS}
DEFINITIONS ${CLHEP_DEFINITIONS}
- LINK_LIBRARIES ${XERCESC_LIBRARIES} ${GEANT4_LIBRARIES} ${CLHEP_LIBRARIES} AthenaBaseComps LArG4Code LArReadoutGeometry CaloG4SimLib StoreGateLib SGtests
- PRIVATE_LINK_LIBRARIES ${Boost_LIBRARIES} ${CORAL_LIBRARIES} AthenaKernel GaudiKernel LArG4RunControl LArHV )
+ LINK_LIBRARIES ${XERCESC_LIBRARIES} ${GEANT4_LIBRARIES} ${CLHEP_LIBRARIES} AthenaBaseComps LArG4Code LArReadoutGeometry CaloG4SimLib GeoModelInterfaces StoreGateLib SGtests
+ PRIVATE_LINK_LIBRARIES ${Boost_LIBRARIES} ${CORAL_LIBRARIES} AthenaKernel GaudiKernel LArG4RunControl LArHV RDBAccessSvcLib )
atlas_install_python_modules( python/*.py )
diff --git a/LArCalorimeter/LArG4/LArG4MiniFCAL/CMakeLists.txt b/LArCalorimeter/LArG4/LArG4MiniFCAL/CMakeLists.txt
index a90464572f9..0d56009e2a5 100644
--- a/LArCalorimeter/LArG4/LArG4MiniFCAL/CMakeLists.txt
+++ b/LArCalorimeter/LArG4/LArG4MiniFCAL/CMakeLists.txt
@@ -32,6 +32,6 @@ atlas_add_component( LArG4MiniFCAL
PRIVATE_INCLUDE_DIRS ${Boost_INCLUDE_DIRS} ${CORAL_INCLUDE_DIRS} ${CLHEP_INCLUDE_DIRS}
PRIVATE_DEFINITIONS ${CLHEP_DEFINITIONS}
LINK_LIBRARIES ${XERCESC_LIBRARIES} ${GEANT4_LIBRARIES} LArG4Code CaloG4SimLib StoreGateLib SGtests
- PRIVATE_LINK_LIBRARIES ${Boost_LIBRARIES} ${CORAL_LIBRARIES} ${CLHEP_LIBRARIES} GaudiKernel Identifier LArG4RunControl )
+ PRIVATE_LINK_LIBRARIES ${Boost_LIBRARIES} ${CORAL_LIBRARIES} ${CLHEP_LIBRARIES} GaudiKernel Identifier LArG4RunControl GeoModelInterfaces RDBAccessSvcLib )
atlas_install_python_modules( python/*.py )
diff --git a/LArCalorimeter/LArG4/LArG4ShowerLib/CMakeLists.txt b/LArCalorimeter/LArG4/LArG4ShowerLib/CMakeLists.txt
index 89ad3036474..31f351cd604 100644
--- a/LArCalorimeter/LArG4/LArG4ShowerLib/CMakeLists.txt
+++ b/LArCalorimeter/LArG4/LArG4ShowerLib/CMakeLists.txt
@@ -23,6 +23,6 @@ atlas_add_library( LArG4ShowerLib
PUBLIC_HEADERS LArG4ShowerLib
PRIVATE_INCLUDE_DIRS ${ROOT_INCLUDE_DIRS} ${XERCESC_INCLUDE_DIRS} ${GEANT4_INCLUDE_DIRS} ${CLHEP_INCLUDE_DIRS}
PRIVATE_DEFINITIONS ${CLHEP_DEFINITIONS}
- LINK_LIBRARIES AthContainers LArG4Code
- PRIVATE_LINK_LIBRARIES ${ROOT_LIBRARIES} ${XERCESC_LIBRARIES} ${GEANT4_LIBRARIES} ${CLHEP_LIBRARIES} AtlasHepMCLib )
+ LINK_LIBRARIES AthContainers LArG4Code AtlasHepMCLib
+ PRIVATE_LINK_LIBRARIES ${ROOT_LIBRARIES} ${XERCESC_LIBRARIES} ${GEANT4_LIBRARIES} ${CLHEP_LIBRARIES} )
diff --git a/Simulation/Barcode/BarcodeEvent/CMakeLists.txt b/Simulation/Barcode/BarcodeEvent/CMakeLists.txt
index 37d06fb5296..ba8c20be4d0 100644
--- a/Simulation/Barcode/BarcodeEvent/CMakeLists.txt
+++ b/Simulation/Barcode/BarcodeEvent/CMakeLists.txt
@@ -9,5 +9,7 @@ atlas_subdir( BarcodeEvent )
atlas_depends_on_subdirs( PUBLIC
GaudiKernel )
-# Install files from the package:
-atlas_install_headers( BarcodeEvent )
+atlas_add_library( BarcodeEventLib
+ BarcodeEvent/*.h
+ INTERFACE
+ PUBLIC_HEADERS BarcodeEvent )
diff --git a/Simulation/Barcode/BarcodeInterfaces/CMakeLists.txt b/Simulation/Barcode/BarcodeInterfaces/CMakeLists.txt
index d3c47e88899..d2da87fff93 100644
--- a/Simulation/Barcode/BarcodeInterfaces/CMakeLists.txt
+++ b/Simulation/Barcode/BarcodeInterfaces/CMakeLists.txt
@@ -10,6 +10,9 @@ atlas_depends_on_subdirs( PUBLIC
GaudiKernel
Simulation/Barcode/BarcodeEvent )
-# Install files from the package:
-atlas_install_headers( BarcodeInterfaces )
+atlas_add_library( BarcodeInterfacesLib
+ BarcodeInterfaces/*.h
+ INTERFACE
+ PUBLIC_HEADERS BarcodeInterfaces
+ LINK_LIBRARIES BarcodeEventLib GaudiKernel )
diff --git a/Simulation/Barcode/BarcodeServices/CMakeLists.txt b/Simulation/Barcode/BarcodeServices/CMakeLists.txt
index 4d5a7f0dbd6..c50234e4d8e 100644
--- a/Simulation/Barcode/BarcodeServices/CMakeLists.txt
+++ b/Simulation/Barcode/BarcodeServices/CMakeLists.txt
@@ -34,7 +34,7 @@ atlas_add_component( BarcodeServices
src/*.cxx
src/components/*.cxx
INCLUDE_DIRS ${ROOT_INCLUDE_DIRS}
- LINK_LIBRARIES ${ROOT_LIBRARIES} AthenaBaseComps GaudiKernel BarcodeServicesLib )
+ LINK_LIBRARIES ${ROOT_LIBRARIES} AthenaBaseComps GaudiKernel BarcodeEventLib BarcodeInterfacesLib BarcodeServicesLib )
# Install files from the package:
atlas_install_python_modules( python/*.py )
diff --git a/Simulation/BeamEffects/CMakeLists.txt b/Simulation/BeamEffects/CMakeLists.txt
index 4bc0f27b9b6..af8e055daed 100644
--- a/Simulation/BeamEffects/CMakeLists.txt
+++ b/Simulation/BeamEffects/CMakeLists.txt
@@ -31,21 +31,19 @@ include_directories(SYSTEM ${EIGEN_INCLUDE_DIRS})
atlas_add_test( BeamEffectsAlg_test
SOURCES src/*.cxx test/BeamEffectsAlg_test.cxx
INCLUDE_DIRS ${EIGEN_INCLUDE_DIRS} ${CLHEP_INCLUDE_DIRS} ${GTEST_INCLUDE_DIRS} #${GMOCK_INCLUDE_DIRS}
- LINK_LIBRARIES ${CLHEP_LIBRARIES} AtlasHepMCLib GaudiKernel TestTools AthenaBaseComps StoreGateLib EventInfo GeneratorObjects BeamSpotConditionsData ${GTEST_LIBRARIES} #${GMOCK_LIBRARIES}
+ LINK_LIBRARIES ${CLHEP_LIBRARIES} AtlasHepMCLib GaudiKernel TestTools AthenaBaseComps StoreGateLib EventInfo GeneratorObjects HepMC_InterfacesLib BeamSpotConditionsData ${GTEST_LIBRARIES} #${GMOCK_LIBRARIES}
)
-
#Added test of new component accumulator syntax
atlas_add_test( BeamEffectsAlgConfig_test
SCRIPT python/BeamEffectsAlgConfig.py
PROPERTIES TIMEOUT 300 )
-
atlas_add_component( BeamEffects
src/*.cxx
src/components/*.cxx
INCLUDE_DIRS ${EIGEN_INCLUDE_DIRS} ${CLHEP_INCLUDE_DIRS}
- LINK_LIBRARIES ${CLHEP_LIBRARIES} AtlasHepMCLib GaudiKernel AthenaBaseComps StoreGateLib EventInfo GeneratorObjects BeamSpotConditionsData )
+ LINK_LIBRARIES ${CLHEP_LIBRARIES} AtlasHepMCLib GaudiKernel AthenaBaseComps HepMC_InterfacesLib StoreGateLib EventInfo GeneratorObjects BeamSpotConditionsData )
# Install files from the package:
atlas_install_python_modules( python/*.py )
diff --git a/Simulation/FastShower/FastCaloSim/CMakeLists.txt b/Simulation/FastShower/FastCaloSim/CMakeLists.txt
index 85e00e690e4..4a606b4fe66 100644
--- a/Simulation/FastShower/FastCaloSim/CMakeLists.txt
+++ b/Simulation/FastShower/FastCaloSim/CMakeLists.txt
@@ -81,8 +81,8 @@ atlas_add_library( FastCaloSimLib
INCLUDE_DIRS ${ROOT_INCLUDE_DIRS} ${HEPPDT_INCLUDE_DIRS}
PRIVATE_INCLUDE_DIRS ${CLHEP_INCLUDE_DIRS} ${EIGEN_INCLUDE_DIRS}
PRIVATE_DEFINITIONS ${CLHEP_DEFINITIONS}
- LINK_LIBRARIES ${ROOT_LIBRARIES} ${HEPPDT_LIBRARIES} CaloEvent CaloIdentifier AthenaBaseComps AthenaKernel Identifier GaudiKernel LArRecEvent TileEvent TrkEventPrimitives TrkParameters TrkExInterfaces CaloDetDescrLib StoreGateLib SGtests
- PRIVATE_LINK_LIBRARIES ${CLHEP_LIBRARIES} AtlasHepMCLib ${EIGEN_LIBRARIES} AthAllocators AthenaPoolUtilities AtlasDetDescr GeoPrimitives EventKernel NavFourMom GeneratorObjects TruthUtils FastCaloSimAthenaPool PathResolver TrkGeometry TrkSurfaces TrkMaterialOnTrack )
+ 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} AtlasHepMCLib ${EIGEN_LIBRARIES} AthAllocators AthenaPoolUtilities AtlasDetDescr DetDescrCondToolsLib GeoPrimitives EventKernel NavFourMom GeneratorObjects TruthUtils PathResolver TrkGeometry TrkSurfaces TrkMaterialOnTrack )
atlas_add_component( FastCaloSim
src/components/*.cxx
diff --git a/Simulation/FastShower/FastCaloSimHit/CMakeLists.txt b/Simulation/FastShower/FastCaloSimHit/CMakeLists.txt
index 8b9b570c360..7108e6e2ac9 100644
--- a/Simulation/FastShower/FastCaloSimHit/CMakeLists.txt
+++ b/Simulation/FastShower/FastCaloSimHit/CMakeLists.txt
@@ -35,7 +35,7 @@ atlas_depends_on_subdirs( PUBLIC
atlas_add_library( FastCaloSimHitLib
src/*.cxx
PUBLIC_HEADERS FastCaloSimHit
- LINK_LIBRARIES AthenaBaseComps GaudiKernel LArSimEvent TileSimEvent StoreGateLib SGtests PileUpToolsLib TileConditionsLib
+ LINK_LIBRARIES AthenaBaseComps GaudiKernel CaloInterfaceLib LArSimEvent TileSimEvent StoreGateLib SGtests PileUpToolsLib TileConditionsLib
PRIVATE_LINK_LIBRARIES CaloEvent CaloIdentifier EventInfo TileEvent )
atlas_add_component( FastCaloSimHit
diff --git a/Simulation/FastSimulation/FastSimulationEvent/CMakeLists.txt b/Simulation/FastSimulation/FastSimulationEvent/CMakeLists.txt
index 250309efbfc..f67c472d0da 100644
--- a/Simulation/FastSimulation/FastSimulationEvent/CMakeLists.txt
+++ b/Simulation/FastSimulation/FastSimulationEvent/CMakeLists.txt
@@ -11,9 +11,8 @@ atlas_depends_on_subdirs( PUBLIC
DetectorDescription/GeoPrimitives
Tracking/TrkEvent/TrkMaterialOnTrack )
-# External dependencies:
-find_package( Eigen )
-
-# Install files from the package:
-atlas_install_headers( FastSimulationEvent )
+atlas_add_library( FastSimulationEventLib
+ src/*.cxx
+ PUBLIC_HEADERS FastSimulationEvent
+ LINK_LIBRARIES AthenaKernel GeoPrimitives TrkMaterialOnTrack )
diff --git a/Simulation/G4Atlas/G4AtlasAlg/CMakeLists.txt b/Simulation/G4Atlas/G4AtlasAlg/CMakeLists.txt
index 4bd638d8770..c49cd430ed4 100644
--- a/Simulation/G4Atlas/G4AtlasAlg/CMakeLists.txt
+++ b/Simulation/G4Atlas/G4AtlasAlg/CMakeLists.txt
@@ -35,7 +35,7 @@ atlas_add_library( G4AtlasAlgLib
PUBLIC_HEADERS G4AtlasAlg
INCLUDE_DIRS ${GEANT4_INCLUDE_DIRS} ${EIGEN_INCLUDE_DIRS} ${XERCESC_INCLUDE_DIRS} ${CLHEP_INCLUDE_DIRS}
- LINK_LIBRARIES ${GEANT4_LIBRARIES} ${EIGEN_LIBRARIES} ${XERCESC_LIBRARIES} ${CLHEP_LIBRARIES} AtlasHepMCLib AthenaBaseComps AthenaKernel GaudiKernel G4AtlasInterfaces SGTools StoreGateLib SGtests EventInfo GeneratorObjects MCTruthBaseLib )
+ LINK_LIBRARIES ${GEANT4_LIBRARIES} ${EIGEN_LIBRARIES} ${XERCESC_LIBRARIES} ${CLHEP_LIBRARIES} AtlasHepMCLib AthenaBaseComps AthenaKernel BarcodeInterfacesLib GaudiKernel G4AtlasInterfaces SGTools StoreGateLib SGtests EventInfo GeneratorObjects GeoModelInterfaces ISF_InterfacesLib MCTruthBaseLib )
# Component(s) in the package:
atlas_add_component( G4AtlasAlg
diff --git a/Simulation/G4Atlas/G4AtlasTests/CMakeLists.txt b/Simulation/G4Atlas/G4AtlasTests/CMakeLists.txt
index 307695cfc60..8a41c26951a 100644
--- a/Simulation/G4Atlas/G4AtlasTests/CMakeLists.txt
+++ b/Simulation/G4Atlas/G4AtlasTests/CMakeLists.txt
@@ -50,7 +50,7 @@ find_package( XercesC )
atlas_add_component( G4AtlasTests
src/*.cxx
INCLUDE_DIRS ${ROOT_INCLUDE_DIRS} ${XERCESC_INCLUDE_DIRS} ${CLHEP_INCLUDE_DIRS} ${GEANT4_INCLUDE_DIRS} ${EIGEN_INCLUDE_DIRS}
- LINK_LIBRARIES ${ROOT_LIBRARIES} ${XERCESC_LIBRARIES} ${CLHEP_LIBRARIES} AtlasHepMCLib ${GEANT4_LIBRARIES} ${EIGEN_LIBRARIES} AthenaBaseComps GaudiKernel CaloDetDescrLib CaloIdentifier CaloSimEvent AthenaKernel StoreGateLib SGtests GeoAdaptors GeoPrimitives Identifier EventInfo ALFA_SimEv LUCID_SimEvent ZDC_SimEvent GeneratorObjects InDetSimEvent LArSimEvent MuonReadoutGeometry MuonIdHelpersLib MuonSimEvent McParticleEvent G4AtlasToolsLib MCTruth HitManagement TileDetDescr TileIdentifier TileSimEvent )
+ LINK_LIBRARIES ${ROOT_LIBRARIES} ${XERCESC_LIBRARIES} ${CLHEP_LIBRARIES} AtlasHepMCLib ${GEANT4_LIBRARIES} ${EIGEN_LIBRARIES} AthenaBaseComps GaudiKernel CaloDetDescrLib CaloIdentifier CaloSimEvent AthenaKernel StoreGateLib SGtests GeoAdaptors GeoPrimitives Identifier EventInfo ALFA_SimEv LUCID_SimEvent ZDC_SimEvent GeneratorObjects InDetSimEvent LArSimEvent MuonReadoutGeometry MuonIdHelpersLib MuonSimEvent McParticleEvent G4AtlasToolsLib MCTruth HitManagement TileDetDescr TileIdentifier TileSimEvent TrackRecordLib )
# Install files from the package:
atlas_install_headers( G4AtlasTests )
diff --git a/Simulation/G4Atlas/G4AtlasTools/CMakeLists.txt b/Simulation/G4Atlas/G4AtlasTools/CMakeLists.txt
index c673cc6eb66..b2485364a43 100644
--- a/Simulation/G4Atlas/G4AtlasTools/CMakeLists.txt
+++ b/Simulation/G4Atlas/G4AtlasTools/CMakeLists.txt
@@ -28,7 +28,7 @@ atlas_add_library( G4AtlasToolsLib
INCLUDE_DIRS ${XERCESC_INCLUDE_DIRS} ${GEANT4_INCLUDE_DIRS} ${TBB_INCLUDE_DIRS}
PRIVATE_INCLUDE_DIRS ${Boost_INCLUDE_DIRS} ${CLHEP_INCLUDE_DIRS}
PRIVATE_DEFINITIONS ${CLHEP_DEFINITIONS}
- LINK_LIBRARIES ${XERCESC_LIBRARIES} ${GEANT4_LIBRARIES} ${TBB_LIBRARIES} AthenaBaseComps G4AtlasInterfaces
+ LINK_LIBRARIES ${XERCESC_LIBRARIES} ${GEANT4_LIBRARIES} ${TBB_LIBRARIES} AthenaBaseComps G4AtlasInterfaces SubDetectorEnvelopesLib
PRIVATE_LINK_LIBRARIES ${Boost_LIBRARIES} ${CLHEP_LIBRARIES} GaudiKernel )
atlas_add_component( G4AtlasTools
diff --git a/Simulation/G4Extensions/G4CosmicFilter/CMakeLists.txt b/Simulation/G4Extensions/G4CosmicFilter/CMakeLists.txt
index c339ad433be..32c07d1a7ad 100644
--- a/Simulation/G4Extensions/G4CosmicFilter/CMakeLists.txt
+++ b/Simulation/G4Extensions/G4CosmicFilter/CMakeLists.txt
@@ -26,7 +26,7 @@ atlas_add_component( G4CosmicFilter
src/*.cxx
src/components/*.cxx
INCLUDE_DIRS ${GEANT4_INCLUDE_DIRS} ${XERCESC_INCLUDE_DIRS} ${CLHEP_INCLUDE_DIRS}
- LINK_LIBRARIES ${GEANT4_LIBRARIES} ${XERCESC_LIBRARIES} ${CLHEP_LIBRARIES} AthenaBaseComps StoreGateLib SGtests GaudiKernel G4AtlasInterfaces G4AtlasToolsLib MCTruth )
+ LINK_LIBRARIES ${GEANT4_LIBRARIES} ${XERCESC_LIBRARIES} ${CLHEP_LIBRARIES} AthenaBaseComps StoreGateLib SGtests GaudiKernel G4AtlasInterfaces G4AtlasToolsLib MCTruth TrackRecordLib )
# Install files from the package:
atlas_install_headers( G4CosmicFilter )
diff --git a/Simulation/G4Sim/MCTruthBase/CMakeLists.txt b/Simulation/G4Sim/MCTruthBase/CMakeLists.txt
index ffe5e7f3d06..1849bf34dff 100644
--- a/Simulation/G4Sim/MCTruthBase/CMakeLists.txt
+++ b/Simulation/G4Sim/MCTruthBase/CMakeLists.txt
@@ -35,7 +35,7 @@ atlas_add_library( MCTruthBaseLib
DEFINITIONS ${CLHEP_DEFINITIONS}
LINK_LIBRARIES ${GEANT4_LIBRARIES} ${XERCESC_LIBRARIES} ${CLHEP_LIBRARIES} AtlasHepMCLib AthenaKernel GaudiKernel StoreGateLib SGtests G4AtlasToolsLib
PRIVATE_LINK_LIBRARIES AthenaBaseComps
- G4AtlasInterfaces MCTruth SimHelpers ISF_Interfaces
+ G4AtlasInterfaces MCTruth SimHelpers ISF_InterfacesLib
AtlasDetDescr ISF_Geant4Event
)
@@ -47,7 +47,7 @@ atlas_add_component( MCTruthBase
AtlasHepMCLib AthenaKernel GaudiKernel
AthenaBaseComps StoreGateLib SGtests
G4AtlasInterfaces G4AtlasToolsLib MCTruth
- SimHelpers ISF_Interfaces
+ SimHelpers ISF_InterfacesLib
AtlasDetDescr MCTruthBaseLib
ISF_Geant4Event )
diff --git a/Simulation/G4SimCnv/G4SimTPCnv/CMakeLists.txt b/Simulation/G4SimCnv/G4SimTPCnv/CMakeLists.txt
index 204f24fb82b..abd1b40a832 100644
--- a/Simulation/G4SimCnv/G4SimTPCnv/CMakeLists.txt
+++ b/Simulation/G4SimCnv/G4SimTPCnv/CMakeLists.txt
@@ -25,7 +25,7 @@ atlas_add_tpcnv_library( G4SimTPCnv
INCLUDE_DIRS ${CLHEP_INCLUDE_DIRS}
PRIVATE_INCLUDE_DIRS ${ROOT_INCLUDE_DIRS}
DEFINITIONS ${CLHEP_DEFINITIONS}
- LINK_LIBRARIES ${ROOT_LIBRARIES} ${CLHEP_LIBRARIES} AthenaPoolCnvSvcLib AthenaKernel )
+ LINK_LIBRARIES ${ROOT_LIBRARIES} ${CLHEP_LIBRARIES} AthenaPoolCnvSvcLib AthenaPoolServicesLib AthenaKernel TrackRecordLib )
atlas_add_dictionary( G4SimTPCnvDict
G4SimTPCnv/G4SimTPCnvDict.h
diff --git a/Simulation/G4Utilities/Geo2G4/CMakeLists.txt b/Simulation/G4Utilities/Geo2G4/CMakeLists.txt
index 360303d5eda..65e07185004 100644
--- a/Simulation/G4Utilities/Geo2G4/CMakeLists.txt
+++ b/Simulation/G4Utilities/Geo2G4/CMakeLists.txt
@@ -37,7 +37,7 @@ atlas_add_library( Geo2G4Lib
PRIVATE_INCLUDE_DIRS ${Boost_INCLUDE_DIRS} ${CLHEP_INCLUDE_DIRS} ${GEOMODELCORE_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 GeoModelUtilities StoreGateLib SGtests )
+ PRIVATE_LINK_LIBRARIES ${Boost_LIBRARIES} ${CLHEP_LIBRARIES} ${GEOMODELCORE_LIBRARIES} AthenaBaseComps GeoSpecialShapes G4AtlasToolsLib SimHelpers GeoMaterial2G4 AthenaKernel GeoModelInterfaces GeoModelUtilities StoreGateLib SGtests GeoPrimitives )
atlas_add_component( Geo2G4
src/components/*.cxx
diff --git a/Simulation/G4Utilities/MCTruthAlgs/CMakeLists.txt b/Simulation/G4Utilities/MCTruthAlgs/CMakeLists.txt
index 65e5a40324e..991e913f851 100644
--- a/Simulation/G4Utilities/MCTruthAlgs/CMakeLists.txt
+++ b/Simulation/G4Utilities/MCTruthAlgs/CMakeLists.txt
@@ -23,7 +23,7 @@ atlas_add_library( MCTruthAlgsLib
INCLUDE_DIRS ${HEPPDT_INCLUDE_DIRS}
PRIVATE_INCLUDE_DIRS ${CLHEP_INCLUDE_DIRS}
PRIVATE_DEFINITIONS ${CLHEP_DEFINITIONS}
- LINK_LIBRARIES ${HEPPDT_LIBRARIES} AthenaBaseComps GaudiKernel
+ LINK_LIBRARIES ${HEPPDT_LIBRARIES} AthenaBaseComps GaudiKernel TrackRecordLib
PRIVATE_LINK_LIBRARIES ${CLHEP_LIBRARIES} )
atlas_add_component( MCTruthAlgs
diff --git a/Simulation/G4Utilities/MCTruthSimAlgs/CMakeLists.txt b/Simulation/G4Utilities/MCTruthSimAlgs/CMakeLists.txt
index 236ea6973b5..88d84bad8ca 100644
--- a/Simulation/G4Utilities/MCTruthSimAlgs/CMakeLists.txt
+++ b/Simulation/G4Utilities/MCTruthSimAlgs/CMakeLists.txt
@@ -25,7 +25,7 @@ atlas_depends_on_subdirs( PRIVATE
atlas_add_component( MCTruthSimAlgs
src/*.cxx
src/components/MCTruthSimAlgs_entries.cxx
- LINK_LIBRARIES CaloSimEvent AthenaBaseComps AthenaKernel PileUpToolsLib StoreGateLib SGtests xAODJet GaudiKernel GeneratorObjects TruthUtils MuonSimEvent RecEvent EventInfo)
+ LINK_LIBRARIES CaloSimEvent AthenaBaseComps AthenaKernel PileUpToolsLib StoreGateLib SGtests xAODJet GaudiKernel GeneratorObjects TruthUtils MuonSimEvent RecEvent EventInfo TrackRecordLib )
# Install files from the package:
atlas_install_python_modules( python/*.py )
diff --git a/Simulation/G4Utilities/TrackWriteFastSim/CMakeLists.txt b/Simulation/G4Utilities/TrackWriteFastSim/CMakeLists.txt
index c6a25d31dd4..70e02fe3c05 100644
--- a/Simulation/G4Utilities/TrackWriteFastSim/CMakeLists.txt
+++ b/Simulation/G4Utilities/TrackWriteFastSim/CMakeLists.txt
@@ -27,7 +27,7 @@ atlas_add_library( TrackWriteFastSimLib
INCLUDE_DIRS ${GEANT4_INCLUDE_DIRS} ${XERCESC_INCLUDE_DIRS}
PRIVATE_INCLUDE_DIRS ${CLHEP_INCLUDE_DIRS}
PRIVATE_DEFINITIONS ${CLHEP_DEFINITIONS}
- LINK_LIBRARIES ${GEANT4_LIBRARIES} ${XERCESC_LIBRARIES} StoreGateLib SGtests G4AtlasToolsLib
+ LINK_LIBRARIES ${GEANT4_LIBRARIES} ${XERCESC_LIBRARIES} StoreGateLib SGtests G4AtlasToolsLib TrackRecordLib
PRIVATE_LINK_LIBRARIES ${CLHEP_LIBRARIES} GaudiKernel G4AtlasInterfaces MCTruth )
atlas_add_component( TrackWriteFastSim
diff --git a/Simulation/ISF/ISF_Core/ISF_Algorithms/CMakeLists.txt b/Simulation/ISF/ISF_Core/ISF_Algorithms/CMakeLists.txt
index 3cbe4f08756..75c22e7ffd3 100644
--- a/Simulation/ISF/ISF_Core/ISF_Algorithms/CMakeLists.txt
+++ b/Simulation/ISF/ISF_Core/ISF_Algorithms/CMakeLists.txt
@@ -37,16 +37,16 @@ atlas_add_component( ISF_Algorithms
src/*.h src/*.cxx src/components/*.cxx
INCLUDE_DIRS ${Boost_INCLUDE_DIRS} ${ROOT_INCLUDE_DIRS}
LINK_LIBRARIES ${Boost_LIBRARIES} ${ROOT_LIBRARIES} GaudiKernel
- AthenaBaseComps StoreGateLib AtlasDetDescr GeneratorObjects
- ISF_Event ISF_Interfaces PmbCxxUtils InDetSimEvent LArSimEvent TileSimEvent
- MuonSimEvent )
+ AthenaBaseComps StoreGateLib AtlasDetDescr GeneratorObjects HepMC_InterfacesLib
+ ISF_Event ISF_InterfacesLib PmbCxxUtils InDetSimEvent LArSimEvent TileSimEvent
+ MuonSimEvent TrackRecordLib )
atlas_add_test( CollectionMerger_test
SOURCES test/CollectionMerger_test.cxx src/CollectionMerger.h
src/CollectionMerger.cxx
INCLUDE_DIRS ${GTEST_INCLUDE_DIRS} #${GMOCK_INCLUDE_DIRS}
LINK_LIBRARIES TestTools GaudiKernel AthenaBaseComps AtlasDetDescr
- ISF_Event ISF_Interfaces PmbCxxUtils InDetSimEvent LArSimEvent TileSimEvent
+ ISF_Event ISF_InterfacesLib PmbCxxUtils InDetSimEvent LArSimEvent TileSimEvent
MuonSimEvent ${GTEST_LIBRARIES} #${GMOCK_LIBRARIES}
ENVIRONMENT "JOBOPTSEARCHPATH=${CMAKE_CURRENT_SOURCE_DIR}/share" )
@@ -63,12 +63,14 @@ atlas_add_test( SimKernelMT_test
${GMOCK_INCLUDE_DIRS}
LINK_LIBRARIES
ISF_Event
- ISF_Interfaces
+ ISF_InterfacesLib
${EIGEN_LIBRARIES}
${GTEST_LIBRARIES}
${GMOCK_LIBRARIES}
AthenaBaseComps
GeneratorObjects
+ HepMC_InterfacesLib
+ TrackRecordLib
ENVIRONMENT
"JOBOPTSEARCHPATH=${CMAKE_CURRENT_SOURCE_DIR}/test"
)
diff --git a/Simulation/ISF/ISF_Core/ISF_Event/CMakeLists.txt b/Simulation/ISF/ISF_Core/ISF_Event/CMakeLists.txt
index e1acf8b6deb..00e8e845b74 100644
--- a/Simulation/ISF/ISF_Core/ISF_Event/CMakeLists.txt
+++ b/Simulation/ISF/ISF_Core/ISF_Event/CMakeLists.txt
@@ -26,7 +26,7 @@ atlas_add_library( ISF_Event
PUBLIC_HEADERS ISF_Event
INCLUDE_DIRS ${CLHEP_INCLUDE_DIRS} ${EIGEN_INCLUDE_DIRS}
DEFINITIONS ${CLHEP_DEFINITIONS}
- LINK_LIBRARIES ${CLHEP_LIBRARIES} AtlasHepMCLib ${EIGEN_LIBRARIES} TestTools AthenaBaseComps AtlasDetDescr GeoPrimitives GeneratorObjects GaudiKernel )
+ LINK_LIBRARIES ${CLHEP_LIBRARIES} AtlasHepMCLib ${EIGEN_LIBRARIES} TestTools AthenaBaseComps AtlasDetDescr BarcodeEventLib GeoPrimitives GeneratorObjects GaudiKernel )
atlas_add_test( ISFParticle_test
SOURCES
diff --git a/Simulation/ISF/ISF_Core/ISF_Interfaces/CMakeLists.txt b/Simulation/ISF/ISF_Core/ISF_Interfaces/CMakeLists.txt
index 09ce87e72ba..b0af11de853 100644
--- a/Simulation/ISF/ISF_Core/ISF_Interfaces/CMakeLists.txt
+++ b/Simulation/ISF/ISF_Core/ISF_Interfaces/CMakeLists.txt
@@ -24,10 +24,10 @@ find_package( CLHEP )
find_package( Eigen )
# Component(s) in the package:
-atlas_add_library( ISF_Interfaces
+atlas_add_library( ISF_InterfacesLib
src/*.cxx
PUBLIC_HEADERS ISF_Interfaces
INCLUDE_DIRS ${CLHEP_INCLUDE_DIRS} ${EIGEN_INCLUDE_DIRS}
DEFINITIONS ${CLHEP_DEFINITIONS}
- LINK_LIBRARIES ${CLHEP_LIBRARIES} ${EIGEN_LIBRARIES} AthenaBaseComps AthenaKernel AtlasDetDescr GeoPrimitives GaudiKernel GeneratorObjects ISF_Event StoreGateLib SGtests )
+ LINK_LIBRARIES ${CLHEP_LIBRARIES} ${EIGEN_LIBRARIES} AthenaBaseComps AthenaKernel AtlasDetDescr GeoPrimitives GaudiKernel GeneratorObjects ISF_Event StoreGateLib SGtests TrackRecordLib )
diff --git a/Simulation/ISF/ISF_Core/ISF_Services/CMakeLists.txt b/Simulation/ISF/ISF_Core/ISF_Services/CMakeLists.txt
index 57d11d1b075..019b5e6e23c 100644
--- a/Simulation/ISF/ISF_Core/ISF_Services/CMakeLists.txt
+++ b/Simulation/ISF/ISF_Core/ISF_Services/CMakeLists.txt
@@ -48,7 +48,7 @@ atlas_add_component( ISF_Services
src/*.cxx
src/components/*.cxx
INCLUDE_DIRS ${ROOT_INCLUDE_DIRS} ${GEANT4_INCLUDE_DIRS} ${CLHEP_INCLUDE_DIRS} ${HEPPDT_INCLUDE_DIRS}
- LINK_LIBRARIES ${ROOT_LIBRARIES} ${GEANT4_LIBRARIES} AtlasHepMCLib ${CLHEP_LIBRARIES} ${HEPPDT_LIBRARIES} GaudiKernel CaloIdentifier CaloSimEvent AthenaBaseComps StoreGateLib SGtests AtlasDetDescr GeneratorObjects InDetSimEvent MuonSimEvent G4AtlasInterfaces MCTruth SimHelpers ISF_Event ISF_Interfaces TileSimEvent PmbCxxUtils TruthUtils )
+ LINK_LIBRARIES ${ROOT_LIBRARIES} ${GEANT4_LIBRARIES} AtlasHepMCLib ${CLHEP_LIBRARIES} ${HEPPDT_LIBRARIES} GaudiKernel BarcodeInterfacesLib CaloIdentifier CaloSimEvent AthenaBaseComps StoreGateLib SubDetectorEnvelopesLib SGtests AtlasDetDescr GeneratorObjects InDetSimEvent MuonSimEvent G4AtlasInterfaces MCTruth SimHelpers ISF_Event ISF_HepMC_Interfaces ISF_InterfacesLib TileSimEvent PmbCxxUtils TruthUtils )
# Tests in the package:
atlas_add_test( InputConverter_test
@@ -62,10 +62,12 @@ atlas_add_test( InputConverter_test
${GMOCK_INCLUDE_DIRS}
LINK_LIBRARIES
ISF_Event
- ISF_Interfaces
+ ISF_HepMC_Interfaces
+ ISF_InterfacesLib
${GEANT4_LIBRARIES}
${HEPPDT_LIBRARIES}
AthenaBaseComps
+ BarcodeInterfacesLib
GeneratorObjects
MCTruth
${GTEST_LIBRARIES}
@@ -97,6 +99,7 @@ atlas_add_test( TruthSvc_test
${CLHEP_LIBRARIES}
${HEPPDT_LIBRARIES}
GaudiKernel
+ BarcodeInterfacesLib
CaloIdentifier
CaloSimEvent
AthenaBaseComps
@@ -104,7 +107,8 @@ atlas_add_test( TruthSvc_test
InDetSimEvent
MuonSimEvent
ISF_Event
- ISF_Interfaces
+ ISF_HepMC_Interfaces
+ ISF_InterfacesLib
PmbCxxUtils
MCTruth
TruthUtils
diff --git a/Simulation/ISF/ISF_Core/ISF_Tools/CMakeLists.txt b/Simulation/ISF/ISF_Core/ISF_Tools/CMakeLists.txt
index 77d5f84b24d..fc4ca04db18 100644
--- a/Simulation/ISF/ISF_Core/ISF_Tools/CMakeLists.txt
+++ b/Simulation/ISF/ISF_Core/ISF_Tools/CMakeLists.txt
@@ -22,7 +22,7 @@ atlas_depends_on_subdirs( PUBLIC
atlas_add_component( ISF_Tools
src/*.cxx
src/components/*.cxx
- LINK_LIBRARIES GaudiKernel AthenaBaseComps AtlasDetDescr GeneratorObjects ISF_Event ISF_Interfaces )
+ LINK_LIBRARIES GaudiKernel AthenaBaseComps AtlasDetDescr BarcodeInterfacesLib GeneratorObjects ISF_Event ISF_InterfacesLib TrackRecordLib )
# Install files from the package:
atlas_install_python_modules( python/*.py )
diff --git a/Simulation/ISF/ISF_FastCaloSim/ISF_FastCaloSimParametrization/CMakeLists.txt b/Simulation/ISF/ISF_FastCaloSim/ISF_FastCaloSimParametrization/CMakeLists.txt
index ff49138660c..c1e6bab44ee 100644
--- a/Simulation/ISF/ISF_FastCaloSim/ISF_FastCaloSimParametrization/CMakeLists.txt
+++ b/Simulation/ISF/ISF_FastCaloSim/ISF_FastCaloSimParametrization/CMakeLists.txt
@@ -72,14 +72,14 @@ atlas_add_library( ISF_FastCaloSimParametrizationLib
INCLUDE_DIRS ${ROOT_INCLUDE_DIRS} ${HEPPDT_INCLUDE_DIRS}
PRIVATE_INCLUDE_DIRS ${XERCESC_INCLUDE_DIRS} ${CLHEP_INCLUDE_DIRS} ${GEANT4_INCLUDE_DIRS}
PRIVATE_DEFINITIONS ${CLHEP_DEFINITIONS}
- LINK_LIBRARIES ${ROOT_LIBRARIES} ${HEPPDT_LIBRARIES} AtlasHepMCLib CaloGeoHelpers AthenaBaseComps AthenaKernel Identifier GaudiKernel ISF_Interfaces TrkEventPrimitives TrkParameters TrkExInterfaces CaloDetDescrLib StoreGateLib SGtests TileConditionsLib
+ LINK_LIBRARIES ${ROOT_LIBRARIES} ${HEPPDT_LIBRARIES} AtlasHepMCLib CaloGeoHelpers AthenaBaseComps AthenaKernel Identifier GaudiKernel ISF_InterfacesLib TrkEventPrimitives TrkParameters TrkExInterfaces CaloDetDescrLib StoreGateLib SGtests TileConditionsLib
PRIVATE_LINK_LIBRARIES ${XERCESC_LIBRARIES} ${CLHEP_LIBRARIES} ${GEANT4_LIBRARIES} CaloEvent CaloIdentifier AthenaPoolUtilities GeoAdaptors EventInfo NavFourMom GeneratorObjects LArSimEvent ISF_Event ISF_FastCaloSimEvent ISF_FastCaloSimInterfaces TileDetDescr TileSimEvent TrkGeometry TrkSurfaces TrkMaterialOnTrack )
atlas_add_component( ISF_FastCaloSimParametrization
src/*.cxx
src/components/*.cxx
INCLUDE_DIRS ${ROOT_INCLUDE_DIRS} ${HEPPDT_INCLUDE_DIRS} ${XERCESC_INCLUDE_DIRS} ${CLHEP_INCLUDE_DIRS} ${GEANT4_INCLUDE_DIRS}
- LINK_LIBRARIES ${ROOT_LIBRARIES} ${HEPPDT_LIBRARIES} ${XERCESC_LIBRARIES} ${CLHEP_LIBRARIES} AtlasHepMCLib ${GEANT4_LIBRARIES} CaloDetDescrLib CaloGeoHelpers AthenaBaseComps AthenaKernel StoreGateLib SGtests Identifier GaudiKernel ISF_Interfaces TrkEventPrimitives TrkParameters TrkExInterfaces CaloEvent CaloIdentifier AthenaPoolUtilities GeoAdaptors EventInfo NavFourMom GeneratorObjects LArSimEvent ISF_Event ISF_FastCaloSimEvent ISF_FastCaloSimInterfaces TileConditionsLib TileDetDescr TileSimEvent TrkGeometry TrkSurfaces TrkMaterialOnTrack ISF_FastCaloSimParametrizationLib )
+ LINK_LIBRARIES ${ROOT_LIBRARIES} ${HEPPDT_LIBRARIES} ${XERCESC_LIBRARIES} ${CLHEP_LIBRARIES} AtlasHepMCLib ${GEANT4_LIBRARIES} CaloDetDescrLib CaloGeoHelpers CaloInterfaceLib AthenaBaseComps AthenaKernel StoreGateLib SGtests Identifier GaudiKernel ISF_InterfacesLib TrkEventPrimitives TrkParameters TrkExInterfaces CaloEvent CaloIdentifier AthenaPoolUtilities GeoAdaptors EventInfo NavFourMom GeneratorObjects LArSimEvent ISF_Event ISF_FastCaloSimEvent ISF_FastCaloSimInterfaces TileConditionsLib TileDetDescr TileSimEvent TrkGeometry TrkSurfaces TrkMaterialOnTrack ISF_FastCaloSimParametrizationLib )
# Install files from the package:
atlas_install_python_modules( python/*.py )
diff --git a/Simulation/ISF/ISF_FastCaloSim/ISF_FastCaloSimSD/CMakeLists.txt b/Simulation/ISF/ISF_FastCaloSim/ISF_FastCaloSimSD/CMakeLists.txt
index 162cf7156e7..29a7e7802fa 100644
--- a/Simulation/ISF/ISF_FastCaloSim/ISF_FastCaloSimSD/CMakeLists.txt
+++ b/Simulation/ISF/ISF_FastCaloSim/ISF_FastCaloSimSD/CMakeLists.txt
@@ -32,7 +32,7 @@ atlas_add_component( ISF_FastCaloSimSD
src/*.cxx
src/components/*.cxx
INCLUDE_DIRS ${ROOT_INCLUDE_DIRS} ${XERCESC_INCLUDE_DIRS} ${GEANT4_INCLUDE_DIRS} ${CLHEP_INCLUDE_DIRS}
- LINK_LIBRARIES ${ROOT_LIBRARIES} ${XERCESC_LIBRARIES} ${GEANT4_LIBRARIES} ${CLHEP_LIBRARIES} StoreGateLib SGtests GaudiKernel G4AtlasInterfaces G4AtlasToolsLib CaloDetDescrLib CaloIdentifier GeneratorObjects LArG4Code ISF_FastCaloSimEvent Identifier )
+ LINK_LIBRARIES ${ROOT_LIBRARIES} ${XERCESC_LIBRARIES} ${GEANT4_LIBRARIES} ${CLHEP_LIBRARIES} StoreGateLib SGtests GaudiKernel G4AtlasInterfaces G4AtlasToolsLib CaloDetDescrLib CaloIdentifier GeneratorObjects LArG4Code ISF_FastCaloSimEvent Identifier TileG4InterfacesLib )
# Install files from the package:
atlas_install_python_modules( python/*.py )
diff --git a/Simulation/ISF/ISF_FastCaloSim/ISF_FastCaloSimServices/CMakeLists.txt b/Simulation/ISF/ISF_FastCaloSim/ISF_FastCaloSimServices/CMakeLists.txt
index 0f284499c6d..f3972dc300f 100644
--- a/Simulation/ISF/ISF_FastCaloSim/ISF_FastCaloSimServices/CMakeLists.txt
+++ b/Simulation/ISF/ISF_FastCaloSim/ISF_FastCaloSimServices/CMakeLists.txt
@@ -41,7 +41,7 @@ atlas_add_component( ISF_FastCaloSimServices
src/*.cxx
src/components/*.cxx
INCLUDE_DIRS ${CLHEP_INCLUDE_DIRS} ${LWTNN_INCLUDE_DIRS}
- LINK_LIBRARIES ${CLHEP_LIBRARIES} AtlasHepMCLib ${LWTNN_LIBRARIES} AthenaBaseComps AthenaKernel GaudiKernel IdDictParser ISF_Interfaces TrkEventPrimitives TrkExInterfaces CaloEvent StoreGateLib SGtests NavFourMom GeneratorObjects FastCaloSimLib ISF_Event ISF_FastCaloSimEvent ISF_FastCaloSimInterfaces ISF_FastCaloSimParametrizationLib PathResolver)
+ LINK_LIBRARIES ${CLHEP_LIBRARIES} AtlasHepMCLib ${LWTNN_LIBRARIES} AthenaBaseComps AthenaKernel GaudiKernel IdDictParser ISF_InterfacesLib TrkEventPrimitives TrkExInterfaces CaloEvent StoreGateLib SGtests NavFourMom GeneratorObjects FastCaloSimLib ISF_Event ISF_FastCaloSimEvent ISF_FastCaloSimInterfaces ISF_FastCaloSimParametrizationLib PathResolver)
# Install files from the package:
atlas_install_python_modules( python/*.py )
diff --git a/Simulation/ISF/ISF_FastCaloSim/ISF_PunchThroughTools/CMakeLists.txt b/Simulation/ISF/ISF_FastCaloSim/ISF_PunchThroughTools/CMakeLists.txt
index 421e23419bc..a5d6ae7eb2f 100644
--- a/Simulation/ISF/ISF_FastCaloSim/ISF_PunchThroughTools/CMakeLists.txt
+++ b/Simulation/ISF/ISF_FastCaloSim/ISF_PunchThroughTools/CMakeLists.txt
@@ -33,7 +33,7 @@ atlas_add_component( ISF_PunchThroughTools
src/*.cxx
src/components/*.cxx
INCLUDE_DIRS ${HEPPDT_INCLUDE_DIRS} ${ROOT_INCLUDE_DIRS} ${CLHEP_INCLUDE_DIRS} ${EIGEN_INCLUDE_DIRS}
- LINK_LIBRARIES ${HEPPDT_LIBRARIES} ${ROOT_LIBRARIES} ${CLHEP_LIBRARIES} AtlasHepMCLib ${EIGEN_LIBRARIES} AthenaBaseComps AthenaKernel GeoPrimitives ISF_FastCaloSimInterfaces AthContainers GaudiKernel ISF_Event ISF_Interfaces PathResolver )
+ LINK_LIBRARIES ${HEPPDT_LIBRARIES} ${ROOT_LIBRARIES} ${CLHEP_LIBRARIES} AtlasHepMCLib ${EIGEN_LIBRARIES} AthenaBaseComps AthenaKernel BarcodeInterfacesLib GeoPrimitives ISF_FastCaloSimInterfaces AthContainers GaudiKernel ISF_Event ISF_InterfacesLib PathResolver SubDetectorEnvelopesLib )
# Install files from the package:
atlas_install_runtime( Data/*.root )
diff --git a/Simulation/ISF/ISF_Fatras/ISF_FatrasDetDescrInterfaces/CMakeLists.txt b/Simulation/ISF/ISF_Fatras/ISF_FatrasDetDescrInterfaces/CMakeLists.txt
index 540e3f6435c..e03c63bf10a 100644
--- a/Simulation/ISF/ISF_Fatras/ISF_FatrasDetDescrInterfaces/CMakeLists.txt
+++ b/Simulation/ISF/ISF_Fatras/ISF_FatrasDetDescrInterfaces/CMakeLists.txt
@@ -18,6 +18,8 @@ find_package( ROOT COMPONENTS Core Tree MathCore Hist RIO pthread )
# Component(s) in the package:
atlas_add_library( ISF_FatrasDetDescrInterfaces
+ ISF_FatrasDetDescrInterfaces/*.h
+ INTERFACE
PUBLIC_HEADERS ISF_FatrasDetDescrInterfaces
INCLUDE_DIRS ${ROOT_INCLUDE_DIRS} ${EIGEN_INCLUDE_DIRS}
LINK_LIBRARIES ${ROOT_LIBRARIES} ${EIGEN_LIBRARIES} GeoPrimitives EventPrimitives GaudiKernel InDetReadoutGeometry )
diff --git a/Simulation/ISF/ISF_Fatras/ISF_FatrasInterfaces/CMakeLists.txt b/Simulation/ISF/ISF_Fatras/ISF_FatrasInterfaces/CMakeLists.txt
index 654945afb04..a71b62a91b4 100644
--- a/Simulation/ISF/ISF_Fatras/ISF_FatrasInterfaces/CMakeLists.txt
+++ b/Simulation/ISF/ISF_Fatras/ISF_FatrasInterfaces/CMakeLists.txt
@@ -5,23 +5,13 @@
# Declare the package name:
atlas_subdir( ISF_FatrasInterfaces )
-# Declare the package's dependencies:
-atlas_depends_on_subdirs( PUBLIC
- Control/AthContainers
- DetectorDescription/GeoPrimitives
- GaudiKernel
- Simulation/ISF/ISF_Core/ISF_Event
- Tracking/TrkEvent/TrkEventPrimitives
- Tracking/TrkEvent/TrkNeutralParameters
- Tracking/TrkEvent/TrkParameters
- Tracking/TrkExtrapolation/TrkExInterfaces
- Tracking/TrkExtrapolation/TrkExUtils )
-
# External dependencies:
find_package( Eigen )
# Component(s) in the package:
atlas_add_library( ISF_FatrasInterfaces
+ ISF_FatrasInterfaces/*.h
+ INTERFACE
PUBLIC_HEADERS ISF_FatrasInterfaces
INCLUDE_DIRS ${EIGEN_INCLUDE_DIRS}
LINK_LIBRARIES ${EIGEN_LIBRARIES} AthContainers GeoPrimitives GaudiKernel ISF_Event TrkEventPrimitives TrkNeutralParameters TrkParameters TrkExInterfaces TrkExUtils )
diff --git a/Simulation/ISF/ISF_Fatras/ISF_FatrasRecoTools/CMakeLists.txt b/Simulation/ISF/ISF_Fatras/ISF_FatrasRecoTools/CMakeLists.txt
index 059b4cf71a1..5a5c7628841 100644
--- a/Simulation/ISF/ISF_Fatras/ISF_FatrasRecoTools/CMakeLists.txt
+++ b/Simulation/ISF/ISF_Fatras/ISF_FatrasRecoTools/CMakeLists.txt
@@ -42,7 +42,7 @@ find_package( ROOT COMPONENTS Core Tree MathCore Hist RIO pthread )
atlas_add_component( ISF_FatrasRecoTools
src/*.cxx
src/components/*.cxx
- INCLUDE_DIRS ${ROOT_INCLUDE_DIRS} ${EIGEN_INCLUDE_DIRS}
+ INCLUDE_DIRS ${ROOT_INCLUDE_DIRS} ${EIGEN_INCLUDE_DIRS}
LINK_LIBRARIES ${ROOT_LIBRARIES} ${EIGEN_LIBRARIES} AtlasHepMCLib AthenaBaseComps GeoPrimitives Identifier ISF_FatrasEvent TrkEventPrimitives TrkParameters TrkSpacePoint TrkTrackSummary TrkToolInterfaces AtlasDetDescr EventPrimitives GaudiKernel InDetIdentifier InDetPrepRawData SiSpacePoint ISF_FatrasDetDescrModel TrkDetElementBase TrkCompetingRIOsOnTrack TrkEventUtils TrkPrepRawData TrkRIO_OnTrack TrkTrack TrkTruthData )
# Install files from the package:
diff --git a/Simulation/ISF/ISF_Fatras/ISF_FatrasServices/CMakeLists.txt b/Simulation/ISF/ISF_Fatras/ISF_FatrasServices/CMakeLists.txt
index 5d7fa6d075d..19ece0bf0cf 100644
--- a/Simulation/ISF/ISF_Fatras/ISF_FatrasServices/CMakeLists.txt
+++ b/Simulation/ISF/ISF_Fatras/ISF_FatrasServices/CMakeLists.txt
@@ -19,7 +19,7 @@ atlas_depends_on_subdirs( PUBLIC
atlas_add_component( ISF_FatrasServices
src/*.cxx
src/components/*.cxx
- LINK_LIBRARIES AthenaBaseComps AtlasDetDescr GaudiKernel ISF_Interfaces TrkTrack ISF_Event )
+ LINK_LIBRARIES AthenaBaseComps AtlasDetDescr GaudiKernel ISF_InterfacesLib TrkTrack ISF_Event )
# Install files from the package:
atlas_install_python_modules( python/*.py )
diff --git a/Simulation/ISF/ISF_Fatras/ISF_FatrasTools/CMakeLists.txt b/Simulation/ISF/ISF_Fatras/ISF_FatrasTools/CMakeLists.txt
index 99d0352b181..b997dc29b97 100644
--- a/Simulation/ISF/ISF_Fatras/ISF_FatrasTools/CMakeLists.txt
+++ b/Simulation/ISF/ISF_Fatras/ISF_FatrasTools/CMakeLists.txt
@@ -43,4 +43,4 @@ atlas_add_component( ISF_FatrasTools
src/*.cxx
src/components/*.cxx
INCLUDE_DIRS ${ROOT_INCLUDE_DIRS} ${CLHEP_INCLUDE_DIRS} ${EIGEN_INCLUDE_DIRS}
- LINK_LIBRARIES ${ROOT_LIBRARIES} ${CLHEP_LIBRARIES} ${EIGEN_LIBRARIES} AthenaBaseComps AthenaKernel GeoPrimitives EventPrimitives GaudiKernel ISF_Event ISF_Interfaces ISF_FatrasInterfaces TrkDetDescrUtils TrkGeometry TrkEventPrimitives TrkParameters TrkExInterfaces TrkExUtils StoreGateLib SGtests AtlasDetDescr TrkDetDescrInterfaces TrkSurfaces TrkVolumes TrkMaterialOnTrack TrkNeutralParameters TrkTrack )
+ LINK_LIBRARIES ${ROOT_LIBRARIES} ${CLHEP_LIBRARIES} ${EIGEN_LIBRARIES} AthenaBaseComps AthenaKernel GeoPrimitives EventPrimitives FastSimulationEventLib GaudiKernel ISF_Event ISF_InterfacesLib ISF_FatrasInterfaces TrkDetDescrUtils TrkGeometry TrkEventPrimitives TrkParameters TrkExInterfaces TrkExUtils StoreGateLib SGtests AtlasDetDescr TrkDetDescrInterfaces TrkSurfaces TrkVolumes TrkMaterialOnTrack TrkNeutralParameters TrkTrack )
diff --git a/Simulation/ISF/ISF_Fatras/ISF_FatrasToolsG4/CMakeLists.txt b/Simulation/ISF/ISF_Fatras/ISF_FatrasToolsG4/CMakeLists.txt
index 5eb594d7eae..2cbc0ccbb3d 100644
--- a/Simulation/ISF/ISF_Fatras/ISF_FatrasToolsG4/CMakeLists.txt
+++ b/Simulation/ISF/ISF_Fatras/ISF_FatrasToolsG4/CMakeLists.txt
@@ -34,7 +34,7 @@ atlas_add_component( ISF_FatrasToolsG4
src/*.cxx
src/components/*.cxx
INCLUDE_DIRS ${ROOT_INCLUDE_DIRS} ${Boost_INCLUDE_DIRS} ${XERCESC_INCLUDE_DIRS} ${CLHEP_INCLUDE_DIRS} ${GEANT4_INCLUDE_DIRS}
- LINK_LIBRARIES ${ROOT_LIBRARIES} ${Boost_LIBRARIES} ${XERCESC_LIBRARIES} ${CLHEP_LIBRARIES} AtlasHepMCLib ${GEANT4_LIBRARIES} AthenaBaseComps AthenaKernel GaudiKernel ISF_Event ISF_FatrasInterfaces TrkEventPrimitives StoreGateLib SGtests ISF_Interfaces TrkGeometry )
+ LINK_LIBRARIES ${ROOT_LIBRARIES} ${Boost_LIBRARIES} ${XERCESC_LIBRARIES} ${CLHEP_LIBRARIES} AtlasHepMCLib ${GEANT4_LIBRARIES} AthenaBaseComps AthenaKernel GaudiKernel ISF_Event ISF_FatrasInterfaces TrkEventPrimitives StoreGateLib SGtests ISF_InterfacesLib TrkGeometry )
# Install files from the package:
atlas_install_headers( ISF_FatrasToolsG4 )
diff --git a/Simulation/ISF/ISF_Fatras/ISF_FatrasToolsID/CMakeLists.txt b/Simulation/ISF/ISF_Fatras/ISF_FatrasToolsID/CMakeLists.txt
index 5479028ef17..231366c6b1a 100644
--- a/Simulation/ISF/ISF_Fatras/ISF_FatrasToolsID/CMakeLists.txt
+++ b/Simulation/ISF/ISF_Fatras/ISF_FatrasToolsID/CMakeLists.txt
@@ -50,5 +50,5 @@ atlas_add_component( ISF_FatrasToolsID
src/*.cxx
src/components/*.cxx
INCLUDE_DIRS ${ROOT_INCLUDE_DIRS} ${CLHEP_INCLUDE_DIRS}
- LINK_LIBRARIES ${ROOT_LIBRARIES} ${CLHEP_LIBRARIES} AthenaBaseComps AthenaKernel AthContainers Identifier GaudiKernel InDetSimEvent ISF_FatrasInterfaces TrkParameters TrkExInterfaces StoreGateLib SGtests AtlasDetDescr IdDictDetDescr TRT_ConditionsServicesLib InDetIdentifier InDetReadoutGeometry TRT_ReadoutGeometry InDetPrepRawData InDetRIO_OnTrack SiClusterizationToolLib ISF_Event ISF_Interfaces ISF_FatrasDetDescrModel TrkDetElementBase TrkSurfaces TrkEventPrimitives TrkMeasurementBase TrkRIO_OnTrack TrkTrack TrkExUtils TrkToolInterfaces )
+ LINK_LIBRARIES ${ROOT_LIBRARIES} ${CLHEP_LIBRARIES} AthenaBaseComps AthenaKernel AthContainers Identifier GaudiKernel InDetSimEvent ISF_FatrasInterfaces TrkParameters TrkExInterfaces StoreGateLib SGtests AtlasDetDescr IdDictDetDescr TRT_ConditionsServicesLib InDetIdentifier InDetReadoutGeometry TRT_ReadoutGeometry InDetPrepRawData InDetRIO_OnTrack SiClusterizationToolLib ISF_Event ISF_InterfacesLib ISF_FatrasDetDescrModel TrkDetElementBase TrkSurfaces TrkEventPrimitives TrkMeasurementBase TrkRIO_OnTrack TrkTrack TrkExUtils TrkToolInterfaces )
diff --git a/Simulation/ISF/ISF_Fatras/ISF_FatrasToolsMS/CMakeLists.txt b/Simulation/ISF/ISF_Fatras/ISF_FatrasToolsMS/CMakeLists.txt
index aff51d5f82e..2828ae54024 100644
--- a/Simulation/ISF/ISF_Fatras/ISF_FatrasToolsMS/CMakeLists.txt
+++ b/Simulation/ISF/ISF_Fatras/ISF_FatrasToolsMS/CMakeLists.txt
@@ -5,6 +5,9 @@
# Declare the package name:
atlas_subdir( ISF_FatrasToolsMS )
+# External dependencies:
+find_package( CLHEP )
+
# Declare the package's dependencies:
atlas_depends_on_subdirs( PUBLIC
GaudiKernel
@@ -23,13 +26,10 @@ atlas_depends_on_subdirs( PUBLIC
Tracking/TrkEvent/TrkTrack
Tracking/TrkExtrapolation/TrkExInterfaces )
-# External dependencies:
-find_package( CLHEP )
-
# Component(s) in the package:
atlas_add_component( ISF_FatrasToolsMS
src/*.cxx
src/components/*.cxx
INCLUDE_DIRS ${CLHEP_INCLUDE_DIRS}
- LINK_LIBRARIES ${CLHEP_LIBRARIES} AthenaBaseComps AthenaKernel Identifier GaudiKernel MuonSimEvent ISF_FatrasInterfaces TrkParameters TrkExInterfaces MuonReadoutGeometry MuonIdHelpersLib ISF_Event ISF_Interfaces TrkTrack )
+ LINK_LIBRARIES ${CLHEP_LIBRARIES} AthenaBaseComps AthenaKernel Identifier GaudiKernel MuonSimEvent ISF_FatrasInterfaces TrkParameters TrkExInterfaces MuonReadoutGeometry MuonIdHelpersLib ISF_Event ISF_InterfacesLib TrkTrack )
diff --git a/Simulation/ISF/ISF_Geant4/ISF_Geant4CommonServices/CMakeLists.txt b/Simulation/ISF/ISF_Geant4/ISF_Geant4CommonServices/CMakeLists.txt
index bf40c560bd5..0d2a0e38e11 100644
--- a/Simulation/ISF/ISF_Geant4/ISF_Geant4CommonServices/CMakeLists.txt
+++ b/Simulation/ISF/ISF_Geant4/ISF_Geant4CommonServices/CMakeLists.txt
@@ -25,7 +25,7 @@ atlas_add_component( ISF_Geant4CommonServices
src/*.cxx
src/components/*.cxx
INCLUDE_DIRS ${GEANT4_INCLUDE_DIRS} ${XERCESC_INCLUDE_DIRS} ${CLHEP_INCLUDE_DIRS}
- LINK_LIBRARIES ${GEANT4_LIBRARIES} ${XERCESC_LIBRARIES} ${CLHEP_LIBRARIES} GaudiKernel AthenaBaseComps AtlasDetDescr ISF_Event ISF_Interfaces )
+ LINK_LIBRARIES ${GEANT4_LIBRARIES} ${XERCESC_LIBRARIES} ${CLHEP_LIBRARIES} GaudiKernel AthenaBaseComps AtlasDetDescr ISF_Event ISF_InterfacesLib SubDetectorEnvelopesLib )
# Install files from the package:
atlas_install_python_modules( python/*.py )
diff --git a/Simulation/ISF/ISF_Geant4/ISF_Geant4CommonTools/CMakeLists.txt b/Simulation/ISF/ISF_Geant4/ISF_Geant4CommonTools/CMakeLists.txt
index 60a337c4640..8d7b3436104 100644
--- a/Simulation/ISF/ISF_Geant4/ISF_Geant4CommonTools/CMakeLists.txt
+++ b/Simulation/ISF/ISF_Geant4/ISF_Geant4CommonTools/CMakeLists.txt
@@ -19,7 +19,7 @@ atlas_depends_on_subdirs( PUBLIC
atlas_add_component( ISF_Geant4CommonTools
src/*.cxx
src/components/*.cxx
- LINK_LIBRARIES GaudiKernel AthenaBaseComps ISF_Event ISF_Interfaces G4AtlasToolsLib )
+ LINK_LIBRARIES GaudiKernel AthenaBaseComps ISF_Event ISF_InterfacesLib G4AtlasToolsLib )
# Install files from the package:
atlas_install_python_modules( python/*.py )
diff --git a/Simulation/ISF/ISF_Geant4/ISF_Geant4Event/CMakeLists.txt b/Simulation/ISF/ISF_Geant4/ISF_Geant4Event/CMakeLists.txt
index 6bd2f4d29be..8a05034d9ba 100644
--- a/Simulation/ISF/ISF_Geant4/ISF_Geant4Event/CMakeLists.txt
+++ b/Simulation/ISF/ISF_Geant4/ISF_Geant4Event/CMakeLists.txt
@@ -36,7 +36,7 @@ atlas_add_library( ISF_Geant4Event
LINK_LIBRARIES ${ROOT_LIBRARIES}
${XERCESC_LIBRARIES} ${CLHEP_LIBRARIES} AtlasHepMCLib
${GEANT4_LIBRARIES} ${EIGEN_LIBRARIES} ISF_Event
- SimHelpers GeoPrimitives MCTruth)
+ ISF_InterfacesLib SimHelpers GeoPrimitives MCTruth)
#atlas_add_test(SOURCES
# INCLUDE_DIRS ${CLHEP_INCLUDE_DIRS}
@@ -44,4 +44,4 @@ atlas_add_library( ISF_Geant4Event
# LINK_LIBRARIES
# ${CLHEP_LIBRARIES} AtlasHepMCLib
# ${EIGEN_LIBRARIES} ISF_Event SimHelpers GeoPrimitives
-# BarcodeEvent MCTruth)
+# BarcodeEventLib MCTruth)
diff --git a/Simulation/ISF/ISF_Geant4/ISF_Geant4Services/CMakeLists.txt b/Simulation/ISF/ISF_Geant4/ISF_Geant4Services/CMakeLists.txt
index 33392bf411a..e0d85b05996 100644
--- a/Simulation/ISF/ISF_Geant4/ISF_Geant4Services/CMakeLists.txt
+++ b/Simulation/ISF/ISF_Geant4/ISF_Geant4Services/CMakeLists.txt
@@ -25,7 +25,7 @@ atlas_add_component( ISF_Geant4Services
src/*.cxx
src/components/*.cxx
INCLUDE_DIRS ${GEANT4_INCLUDE_DIRS} ${XERCESC_INCLUDE_DIRS} ${CLHEP_INCLUDE_DIRS}
- LINK_LIBRARIES ${GEANT4_LIBRARIES} ${XERCESC_LIBRARIES} ${CLHEP_LIBRARIES} GaudiKernel AthenaBaseComps StoreGateLib SGtests G4AtlasInterfaces ISF_Event ISF_Interfaces )
+ LINK_LIBRARIES ${GEANT4_LIBRARIES} ${XERCESC_LIBRARIES} ${CLHEP_LIBRARIES} GaudiKernel AthenaBaseComps StoreGateLib SGtests G4AtlasInterfaces ISF_Event ISF_InterfacesLib )
# Install files from the package:
atlas_install_python_modules( python/*.py )
diff --git a/Simulation/ISF/ISF_Geant4/ISF_Geant4Tools/CMakeLists.txt b/Simulation/ISF/ISF_Geant4/ISF_Geant4Tools/CMakeLists.txt
index 6aad927886f..86913ccd8f3 100644
--- a/Simulation/ISF/ISF_Geant4/ISF_Geant4Tools/CMakeLists.txt
+++ b/Simulation/ISF/ISF_Geant4/ISF_Geant4Tools/CMakeLists.txt
@@ -17,7 +17,7 @@ atlas_depends_on_subdirs( PUBLIC
Generators/AtlasHepMC
Generators/GeneratorObjects
Simulation/G4Atlas/G4AtlasTools
- Simulation/G4Atlas/G4AtlasAlg
+ Simulation/G4Atlas/G4AtlasAlg
Simulation/G4Sim/MCTruth
Simulation/G4Sim/SimHelpers
Simulation/ISF/ISF_Core/ISF_Event
@@ -36,7 +36,7 @@ atlas_add_component( ISF_Geant4Tools
src/*.cxx
src/components/*.cxx
INCLUDE_DIRS ${ROOT_INCLUDE_DIRS} ${XERCESC_INCLUDE_DIRS} ${CLHEP_INCLUDE_DIRS} ${GEANT4_INCLUDE_DIRS} ${EIGEN_INCLUDE_DIRS}
- LINK_LIBRARIES ${ROOT_LIBRARIES} ${XERCESC_LIBRARIES} ${CLHEP_LIBRARIES} AtlasHepMCLib ${GEANT4_LIBRARIES} ${EIGEN_LIBRARIES} AthenaKernel GaudiKernel G4AtlasInterfaces AthenaBaseComps StoreGateLib SGtests AtlasDetDescr GeneratorObjects G4AtlasToolsLib G4AtlasAlgLib MCTruth SimHelpers ISF_Event ISF_Interfaces ISF_Geant4Event )
+ LINK_LIBRARIES ${ROOT_LIBRARIES} ${XERCESC_LIBRARIES} ${CLHEP_LIBRARIES} AtlasHepMCLib ${GEANT4_LIBRARIES} ${EIGEN_LIBRARIES} AthenaKernel GaudiKernel G4AtlasInterfaces AthenaBaseComps StoreGateLib SGtests AtlasDetDescr GeneratorObjects G4AtlasToolsLib G4AtlasAlgLib MCTruth SimHelpers ISF_Event ISF_InterfacesLib ISF_Geant4Event )
# Install files from the package:
atlas_install_headers( ISF_Geant4Tools )
diff --git a/Simulation/ISF/ISF_Geant4/ISF_Geant4UserActions/CMakeLists.txt b/Simulation/ISF/ISF_Geant4/ISF_Geant4UserActions/CMakeLists.txt
index bb3f6a56d3e..05b2180d439 100644
--- a/Simulation/ISF/ISF_Geant4/ISF_Geant4UserActions/CMakeLists.txt
+++ b/Simulation/ISF/ISF_Geant4/ISF_Geant4UserActions/CMakeLists.txt
@@ -32,7 +32,7 @@ atlas_add_component( ISF_Geant4UserActions
src/*.cxx
src/components/*.cxx
INCLUDE_DIRS ${ROOT_INCLUDE_DIRS} ${XERCESC_INCLUDE_DIRS} ${GEANT4_INCLUDE_DIRS} ${CLHEP_INCLUDE_DIRS}
- LINK_LIBRARIES ${ROOT_LIBRARIES} ${XERCESC_LIBRARIES} ${GEANT4_LIBRARIES} ${CLHEP_LIBRARIES} StoreGateLib SGtests GaudiKernel G4AtlasInterfaces G4AtlasToolsLib CaloDetDescrLib CaloIdentifier GeneratorObjects LArG4Code ISF_FastCaloSimEvent Identifier )
+ LINK_LIBRARIES ${ROOT_LIBRARIES} ${XERCESC_LIBRARIES} ${GEANT4_LIBRARIES} ${CLHEP_LIBRARIES} StoreGateLib SGtests GaudiKernel G4AtlasInterfaces G4AtlasToolsLib CaloDetDescrLib CaloIdentifier GeneratorObjects LArG4Code ISF_FastCaloSimEvent Identifier TileG4InterfacesLib )
# Install files from the package:
atlas_install_python_modules( python/*.py )
diff --git a/Simulation/ISF/ISF_HepMC/ISF_HepMC_Interfaces/CMakeLists.txt b/Simulation/ISF/ISF_HepMC/ISF_HepMC_Interfaces/CMakeLists.txt
index b0845f3d26a..0b9122bb837 100644
--- a/Simulation/ISF/ISF_HepMC/ISF_HepMC_Interfaces/CMakeLists.txt
+++ b/Simulation/ISF/ISF_HepMC/ISF_HepMC_Interfaces/CMakeLists.txt
@@ -11,6 +11,9 @@ atlas_depends_on_subdirs( PUBLIC
Generators/AtlasHepMC
Simulation/ISF/ISF_Core/ISF_Event )
-# Install files from the package:
-atlas_install_headers( ISF_HepMC_Interfaces )
+atlas_add_library( ISF_HepMC_Interfaces
+ ISF_HepMC_Interfaces/*.h
+ INTERFACE
+ PUBLIC_HEADERS ISF_HepMC_Interfaces
+ LINK_LIBRARIES AtlasHepMCLib GaudiKernel ISF_Event )
diff --git a/Simulation/ISF/ISF_HepMC/ISF_HepMC_Tools/CMakeLists.txt b/Simulation/ISF/ISF_HepMC/ISF_HepMC_Tools/CMakeLists.txt
index 78f249afa98..83274b189ef 100644
--- a/Simulation/ISF/ISF_HepMC/ISF_HepMC_Tools/CMakeLists.txt
+++ b/Simulation/ISF/ISF_HepMC/ISF_HepMC_Tools/CMakeLists.txt
@@ -30,25 +30,25 @@ atlas_add_component( ISF_HepMC_Tools
src/*.cxx
src/components/*.cxx
INCLUDE_DIRS ${ROOT_INCLUDE_DIRS}
- LINK_LIBRARIES ${ROOT_LIBRARIES} AtlasHepMCLib GaudiKernel AtlasDetDescr AthenaBaseComps TruthUtils ISF_Event ISF_Interfaces PathResolver )
+ LINK_LIBRARIES ${ROOT_LIBRARIES} AtlasHepMCLib GaudiKernel AtlasDetDescr AthenaBaseComps TruthUtils ISF_Event ISF_HepMC_Interfaces ISF_InterfacesLib PathResolver )
# Tests
atlas_add_test( GenParticleGenericFilter_test
SOURCES test/GenParticleGenericFilter_test.cxx src/GenParticleGenericFilter.cxx
INCLUDE_DIRS ${GTEST_INCLUDE_DIRS} ${GMOCK_INCLUDE_DIRS}
- LINK_LIBRARIES ${GTEST_LIBRARIES} ${GMOCK_LIBRARIES} AtlasHepMCLib AthenaBaseComps )
+ LINK_LIBRARIES ${GTEST_LIBRARIES} ${GMOCK_LIBRARIES} AtlasHepMCLib AthenaBaseComps ISF_HepMC_Interfaces )
# Tests
atlas_add_test( GenParticleInteractingFilter_test
SOURCES test/GenParticleInteractingFilter_test.cxx src/GenParticleInteractingFilter.cxx
INCLUDE_DIRS ${GTEST_INCLUDE_DIRS} ${GMOCK_INCLUDE_DIRS}
- LINK_LIBRARIES ${GTEST_LIBRARIES} ${GMOCK_LIBRARIES} AtlasHepMCLib AthenaBaseComps TruthUtils )
+ LINK_LIBRARIES ${GTEST_LIBRARIES} ${GMOCK_LIBRARIES} AtlasHepMCLib AthenaBaseComps TruthUtils ISF_HepMC_Interfaces )
# Tests
atlas_add_test( GenParticleLifetimeFilter_test
SOURCES test/GenParticleLifetimeFilter_test.cxx src/GenParticleLifetimeFilter.cxx
INCLUDE_DIRS ${GTEST_INCLUDE_DIRS} ${GMOCK_INCLUDE_DIRS}
- LINK_LIBRARIES ${GTEST_LIBRARIES} ${GMOCK_LIBRARIES} AtlasHepMCLib AthenaBaseComps TruthUtils )
+ LINK_LIBRARIES ${GTEST_LIBRARIES} ${GMOCK_LIBRARIES} AtlasHepMCLib AthenaBaseComps TruthUtils ISF_HepMC_Interfaces )
# Install files from the package:
atlas_install_python_modules( python/*.py )
diff --git a/Simulation/ISF/ISF_ParametricSim/ISF_ParSimInterfaces/CMakeLists.txt b/Simulation/ISF/ISF_ParametricSim/ISF_ParSimInterfaces/CMakeLists.txt
index c2dcd3cca32..b203d835754 100644
--- a/Simulation/ISF/ISF_ParametricSim/ISF_ParSimInterfaces/CMakeLists.txt
+++ b/Simulation/ISF/ISF_ParametricSim/ISF_ParSimInterfaces/CMakeLists.txt
@@ -11,6 +11,8 @@ atlas_depends_on_subdirs( PUBLIC
GaudiKernel
Tracking/TrkEvent/TrkParameters )
-# Install files from the package:
-atlas_install_headers( ISF_ParSimInterfaces )
-
+atlas_add_library( ISF_ParSimInterfacesLib
+ ISF_ParSimInterfaces/*.h
+ INTERFACE
+ PUBLIC_HEADERS ISF_ParSimInterfaces
+ LINK_LIBRARIES GaudiKernel TrkParameters xAODTracking )
diff --git a/Simulation/ISF/ISF_ParametricSim/ISF_ParSimServices/CMakeLists.txt b/Simulation/ISF/ISF_ParametricSim/ISF_ParSimServices/CMakeLists.txt
index ff1d99b93db..f7210c1a06a 100644
--- a/Simulation/ISF/ISF_ParametricSim/ISF_ParSimServices/CMakeLists.txt
+++ b/Simulation/ISF/ISF_ParametricSim/ISF_ParSimServices/CMakeLists.txt
@@ -18,9 +18,8 @@ atlas_depends_on_subdirs( PUBLIC
atlas_add_component( ISF_ParSimServices
src/*.cxx
src/components/*.cxx
- LINK_LIBRARIES AthenaBaseComps GaudiKernel ISF_Interfaces TrkDetDescrInterfaces ISF_Event )
+ LINK_LIBRARIES AthenaBaseComps GaudiKernel ISF_InterfacesLib ISF_ParSimInterfacesLib TrkDetDescrInterfaces ISF_Event )
# Install files from the package:
-atlas_install_headers( ISF_ParSimServices )
atlas_install_python_modules( python/*.py )
diff --git a/Simulation/ISF/ISF_ParametricSim/ISF_ParSimTools/CMakeLists.txt b/Simulation/ISF/ISF_ParametricSim/ISF_ParSimTools/CMakeLists.txt
index 1fbd2609ad8..31c2a8934b7 100644
--- a/Simulation/ISF/ISF_ParametricSim/ISF_ParSimTools/CMakeLists.txt
+++ b/Simulation/ISF/ISF_ParametricSim/ISF_ParSimTools/CMakeLists.txt
@@ -30,9 +30,8 @@ atlas_add_component( ISF_ParSimTools
src/*.cxx
src/components/*.cxx
INCLUDE_DIRS ${ROOT_INCLUDE_DIRS} ${CLHEP_INCLUDE_DIRS}
- LINK_LIBRARIES ${ROOT_LIBRARIES} ${CLHEP_LIBRARIES} AthenaBaseComps AthenaKernel xAODTracking GaudiKernel ISF_Interfaces TrkExInterfaces ISF_Event PathResolver TrkParameters )
+ LINK_LIBRARIES ${ROOT_LIBRARIES} ${CLHEP_LIBRARIES} AthenaBaseComps AthenaKernel BeamSpotConditionsData xAODTracking GaudiKernel ISF_InterfacesLib TrkExInterfaces ISF_Event ISF_ParSimInterfacesLib PathResolver TrkParameters )
# Install files from the package:
-atlas_install_headers( ISF_ParSimTools )
atlas_install_runtime( Data/*.txt Data/*.root )
diff --git a/Simulation/ISF/ISF_SimulationSelectors/CMakeLists.txt b/Simulation/ISF/ISF_SimulationSelectors/CMakeLists.txt
index 3e6f6364606..6e0e8c57a54 100644
--- a/Simulation/ISF/ISF_SimulationSelectors/CMakeLists.txt
+++ b/Simulation/ISF/ISF_SimulationSelectors/CMakeLists.txt
@@ -22,8 +22,8 @@ find_package( ROOT COMPONENTS Core Tree MathCore Hist RIO pthread )
atlas_add_component( ISF_SimulationSelectors
src/*.cxx
src/components/*.cxx
- INCLUDE_DIRS ${ROOT_INCLUDE_DIRS}
- LINK_LIBRARIES ${ROOT_LIBRARIES} AtlasHepMCLib GaudiKernel BarcodeServicesLib ISF_Event ISF_Interfaces )
+ INCLUDE_DIRS ${ROOT_INCLUDE_DIRS}
+ LINK_LIBRARIES ${ROOT_LIBRARIES} AtlasHepMCLib GaudiKernel BarcodeServicesLib ISF_Event ISF_InterfacesLib ISF_TrackingInterfacesLib )
# Install files from the package:
atlas_install_python_modules( python/*.py )
diff --git a/Simulation/ISF/ISF_Tracking/ISF_TrackingInterfaces/CMakeLists.txt b/Simulation/ISF/ISF_Tracking/ISF_TrackingInterfaces/CMakeLists.txt
index cfb972892e2..fff627d0896 100644
--- a/Simulation/ISF/ISF_Tracking/ISF_TrackingInterfaces/CMakeLists.txt
+++ b/Simulation/ISF/ISF_Tracking/ISF_TrackingInterfaces/CMakeLists.txt
@@ -9,6 +9,8 @@ atlas_subdir( ISF_TrackingInterfaces )
atlas_depends_on_subdirs( PUBLIC
GaudiKernel )
-# Install files from the package:
-atlas_install_headers( ISF_TrackingInterfaces )
-
+atlas_add_library( ISF_TrackingInterfacesLib
+ ISF_TrackingInterfaces/*.h
+ INTERFACE
+ PUBLIC_HEADERS ISF_TrackingInterfaces
+ LINK_LIBRARIES GaudiKernel )
diff --git a/Simulation/ISF/ISF_Tracking/ISF_TrackingTools/CMakeLists.txt b/Simulation/ISF/ISF_Tracking/ISF_TrackingTools/CMakeLists.txt
index fa6ac65c7bd..3d33a6332f0 100644
--- a/Simulation/ISF/ISF_Tracking/ISF_TrackingTools/CMakeLists.txt
+++ b/Simulation/ISF/ISF_Tracking/ISF_TrackingTools/CMakeLists.txt
@@ -22,7 +22,7 @@ atlas_depends_on_subdirs( PUBLIC
atlas_add_component( ISF_TrackingTools
src/*.cxx
src/components/*.cxx
- LINK_LIBRARIES GaudiKernel AthenaBaseComps ISF_Event TrkDetDescrInterfaces TrkGeometry TrkEventPrimitives TrkParameters TrkExInterfaces )
+ LINK_LIBRARIES GaudiKernel AthenaBaseComps ISF_Event ISF_TrackingInterfacesLib TrkDetDescrInterfaces TrkGeometry TrkEventPrimitives TrkParameters TrkExInterfaces )
# Install files from the package:
atlas_install_python_modules( python/*.py )
diff --git a/Simulation/Interfaces/HepMC_Interfaces/CMakeLists.txt b/Simulation/Interfaces/HepMC_Interfaces/CMakeLists.txt
index f2c455eec6e..e79ad0932bd 100644
--- a/Simulation/Interfaces/HepMC_Interfaces/CMakeLists.txt
+++ b/Simulation/Interfaces/HepMC_Interfaces/CMakeLists.txt
@@ -10,6 +10,9 @@ atlas_depends_on_subdirs( PUBLIC
Generators/AtlasHepMC
GaudiKernel )
-# Install files from the package:
-atlas_install_headers( HepMC_Interfaces )
+atlas_add_library( HepMC_InterfacesLib
+ HepMC_Interfaces/*.h
+ INTERFACE
+ PUBLIC_HEADERS HepMC_Interfaces
+ LINK_LIBRARIES AtlasHepMCLib GaudiKernel )
diff --git a/Simulation/Overlay/OverlayCopyAlgs/CMakeLists.txt b/Simulation/Overlay/OverlayCopyAlgs/CMakeLists.txt
index a83ac8846b1..9b2fcdd6229 100644
--- a/Simulation/Overlay/OverlayCopyAlgs/CMakeLists.txt
+++ b/Simulation/Overlay/OverlayCopyAlgs/CMakeLists.txt
@@ -5,24 +5,13 @@
# Declare the package name:
atlas_subdir( OverlayCopyAlgs )
-# Declare the package's dependencies:
-atlas_depends_on_subdirs( PUBLIC
- GaudiKernel
- PRIVATE
- Calorimeter/CaloSimEvent
- Control/AthenaBaseComps
- Event/xAOD/xAODJet
- Generators/GeneratorObjects
- Reconstruction/RecEvent
- Simulation/G4Sim/TrackRecord )
-
# Component(s) in the package:
atlas_add_component( OverlayCopyAlgs
src/*.cxx
src/components/*.cxx
LINK_LIBRARIES GaudiKernel AthenaBaseComps
CaloSimEvent GeneratorObjects RecEvent
- xAODJet )
+ TrackRecordLib xAODJet )
# Install files from the package:
atlas_install_python_modules( python/*.py
diff --git a/Simulation/Tools/HitAnalysis/CMakeLists.txt b/Simulation/Tools/HitAnalysis/CMakeLists.txt
index c5755f26081..1ebce403dc6 100644
--- a/Simulation/Tools/HitAnalysis/CMakeLists.txt
+++ b/Simulation/Tools/HitAnalysis/CMakeLists.txt
@@ -40,8 +40,8 @@ find_package( ROOT COMPONENTS Core Tree MathCore Hist RIO pthread Table MathMore
atlas_add_component( HitAnalysis
src/*.cxx
src/components/*.cxx
- INCLUDE_DIRS ${ROOT_INCLUDE_DIRS} ${CLHEP_INCLUDE_DIRS}
- LINK_LIBRARIES ${ROOT_LIBRARIES} ${CLHEP_LIBRARIES} AtlasHepMCLib GaudiKernel CaloDetDescrLib CaloIdentifier CaloSimEvent AthenaBaseComps GeoAdaptors EventInfo AFP_SimEv ALFA_SimEv LUCID_SimEvent ZDC_SimEvent GeneratorObjects InDetSimEvent LArSimEvent MuonSimEvent TileDetDescr TileSimEvent )
+ INCLUDE_DIRS ${ROOT_INCLUDE_DIRS} ${CLHEP_INCLUDE_DIRS}
+ LINK_LIBRARIES ${ROOT_LIBRARIES} ${CLHEP_LIBRARIES} AtlasHepMCLib GaudiKernel CaloDetDescrLib CaloIdentifier CaloSimEvent AthenaBaseComps GeoAdaptors EventInfo AFP_SimEv ALFA_SimEv LUCID_SimEvent ZDC_SimEvent GeneratorObjects InDetSimEvent LArSimEvent MuonSimEvent TileDetDescr TileSimEvent TrackRecordLib )
# Install files from the package:
atlas_install_joboptions( share/*.py )
diff --git a/Simulation/TruthJiveXML/CMakeLists.txt b/Simulation/TruthJiveXML/CMakeLists.txt
index fe2785555ab..5c26e995a99 100644
--- a/Simulation/TruthJiveXML/CMakeLists.txt
+++ b/Simulation/TruthJiveXML/CMakeLists.txt
@@ -26,7 +26,7 @@ atlas_add_component( TruthJiveXML
src/*.cxx
src/components/*.cxx
INCLUDE_DIRS ${HEPPDT_INCLUDE_DIRS} ${CLHEP_INCLUDE_DIRS}
- LINK_LIBRARIES ${HEPPDT_LIBRARIES} ${CLHEP_LIBRARIES} AtlasHepMCLib AthenaBaseComps GaudiKernel JiveXMLLib StoreGateLib SGtests EventPrimitives GeneratorObjects )
+ LINK_LIBRARIES ${HEPPDT_LIBRARIES} ${CLHEP_LIBRARIES} AtlasHepMCLib AthenaBaseComps GaudiKernel JiveXMLLib StoreGateLib SGtests EventPrimitives GeneratorObjects TrackRecordLib )
# Install files from the package:
atlas_install_headers( TruthJiveXML )
diff --git a/TileCalorimeter/TileFastCaloSim/CMakeLists.txt b/TileCalorimeter/TileFastCaloSim/CMakeLists.txt
index f8ad66c83c7..61abce859aa 100644
--- a/TileCalorimeter/TileFastCaloSim/CMakeLists.txt
+++ b/TileCalorimeter/TileFastCaloSim/CMakeLists.txt
@@ -32,7 +32,7 @@ atlas_add_component( TileFastCaloSim
src/*.cxx
src/components/*.cxx
INCLUDE_DIRS ${GEANT4_INCLUDE_DIRS} ${XERCESC_INCLUDE_DIRS} ${CLHEP_INCLUDE_DIRS}
- LINK_LIBRARIES ${GEANT4_LIBRARIES} ${XERCESC_LIBRARIES} ${CLHEP_LIBRARIES} CaloEvent CaloIdentifier AthenaBaseComps AthenaKernel GaudiKernel ISF_FastCaloSimEvent TileConditionsLib TileDetDescr TileGeoModelLib TileSimEvent )
+ LINK_LIBRARIES ${GEANT4_LIBRARIES} ${XERCESC_LIBRARIES} ${CLHEP_LIBRARIES} CaloEvent CaloIdentifier AthenaBaseComps AthenaKernel GaudiKernel ISF_FastCaloSimEvent TileConditionsLib TileDetDescr TileGeoModelLib TileG4InterfacesLib TileSimEvent )
# Install files from the package:
atlas_install_joboptions( share/*.py )
diff --git a/TileCalorimeter/TileG4/TileAncillary/CombinedScintillator/CMakeLists.txt b/TileCalorimeter/TileG4/TileAncillary/CombinedScintillator/CMakeLists.txt
index 45ff17552b9..dc893512ae8 100644
--- a/TileCalorimeter/TileG4/TileAncillary/CombinedScintillator/CMakeLists.txt
+++ b/TileCalorimeter/TileG4/TileAncillary/CombinedScintillator/CMakeLists.txt
@@ -26,7 +26,7 @@ atlas_add_component( CombinedScintillator
src/*.cc
src/components/*.cxx
INCLUDE_DIRS ${GEANT4_INCLUDE_DIRS} ${XERCESC_INCLUDE_DIRS} ${CLHEP_INCLUDE_DIRS} ${GEOMODELCORE_INCLUDE_DIRS}
- LINK_LIBRARIES ${GEANT4_LIBRARIES} ${XERCESC_LIBRARIES} ${CLHEP_LIBRARIES} ${GEOMODELCORE_LIBRARIES} CaloIdentifier StoreGateLib SGtests GaudiKernel G4AtlasToolsLib GeoMaterial2G4 TileSimEvent )
+ LINK_LIBRARIES ${GEANT4_LIBRARIES} ${XERCESC_LIBRARIES} ${CLHEP_LIBRARIES} ${GEOMODELCORE_LIBRARIES} CaloIdentifier StoreGateLib SGtests GaudiKernel G4AtlasToolsLib GeoMaterial2G4 GeoModelInterfaces TileSimEvent )
# Install files from the package:
atlas_install_python_modules( python/*.py )
diff --git a/TileCalorimeter/TileG4/TileAncillary/DeadMaterial/CMakeLists.txt b/TileCalorimeter/TileG4/TileAncillary/DeadMaterial/CMakeLists.txt
index 003157f9ace..9935230e5ee 100644
--- a/TileCalorimeter/TileG4/TileAncillary/DeadMaterial/CMakeLists.txt
+++ b/TileCalorimeter/TileG4/TileAncillary/DeadMaterial/CMakeLists.txt
@@ -24,7 +24,7 @@ atlas_add_component( DeadMaterial
src/*.cxx
src/components/*.cxx
INCLUDE_DIRS ${GEANT4_INCLUDE_DIRS} ${XERCESC_INCLUDE_DIRS} ${CLHEP_INCLUDE_DIRS} ${GEOMODELCORE_INCLUDE_DIRS}
- LINK_LIBRARIES ${GEANT4_LIBRARIES} ${XERCESC_LIBRARIES} ${CLHEP_LIBRARIES} ${GEOMODELCORE_LIBRARIES} StoreGateLib SGtests GaudiKernel G4AtlasToolsLib GeoMaterial2G4 )
+ LINK_LIBRARIES ${GEANT4_LIBRARIES} ${XERCESC_LIBRARIES} ${CLHEP_LIBRARIES} ${GEOMODELCORE_LIBRARIES} StoreGateLib SGtests GaudiKernel G4AtlasToolsLib GeoMaterial2G4 GeoModelInterfaces )
# Install files from the package:
atlas_install_python_modules( python/*.py )
diff --git a/TileCalorimeter/TileG4/TileAncillary/LarCrate/CMakeLists.txt b/TileCalorimeter/TileG4/TileAncillary/LarCrate/CMakeLists.txt
index 33792986ca2..3ceff941462 100644
--- a/TileCalorimeter/TileG4/TileAncillary/LarCrate/CMakeLists.txt
+++ b/TileCalorimeter/TileG4/TileAncillary/LarCrate/CMakeLists.txt
@@ -24,7 +24,7 @@ atlas_add_component( LarCrate
src/*.cxx
src/components/*.cxx
INCLUDE_DIRS ${GEANT4_INCLUDE_DIRS} ${XERCESC_INCLUDE_DIRS} ${CLHEP_INCLUDE_DIRS} ${GEOMODELCORE_INCLUDE_DIRS}
- LINK_LIBRARIES ${GEANT4_LIBRARIES} ${XERCESC_LIBRARIES} ${CLHEP_LIBRARIES} ${GEOMODELCORE_LIBRARIES} StoreGateLib SGtests GaudiKernel G4AtlasToolsLib GeoMaterial2G4 )
+ LINK_LIBRARIES ${GEANT4_LIBRARIES} ${XERCESC_LIBRARIES} ${CLHEP_LIBRARIES} ${GEOMODELCORE_LIBRARIES} StoreGateLib SGtests GaudiKernel G4AtlasToolsLib GeoMaterial2G4 GeoModelInterfaces )
# Install files from the package:
atlas_install_python_modules( python/*.py )
diff --git a/TileCalorimeter/TileG4/TileAncillary/MuonWall/CMakeLists.txt b/TileCalorimeter/TileG4/TileAncillary/MuonWall/CMakeLists.txt
index bff63e779bb..176d0e77226 100644
--- a/TileCalorimeter/TileG4/TileAncillary/MuonWall/CMakeLists.txt
+++ b/TileCalorimeter/TileG4/TileAncillary/MuonWall/CMakeLists.txt
@@ -26,7 +26,7 @@ atlas_add_component( MuonWall
src/*.cxx
src/components/*.cxx
INCLUDE_DIRS ${GEANT4_INCLUDE_DIRS} ${XERCESC_INCLUDE_DIRS} ${CLHEP_INCLUDE_DIRS} ${GEOMODELCORE_INCLUDE_DIRS}
- LINK_LIBRARIES ${GEANT4_LIBRARIES} ${XERCESC_LIBRARIES} ${CLHEP_LIBRARIES} ${GEOMODELCORE_LIBRARIES} CaloIdentifier StoreGateLib SGtests GaudiKernel G4AtlasToolsLib GeoMaterial2G4 TileSimEvent )
+ LINK_LIBRARIES ${GEANT4_LIBRARIES} ${XERCESC_LIBRARIES} ${CLHEP_LIBRARIES} ${GEOMODELCORE_LIBRARIES} CaloIdentifier StoreGateLib SGtests GaudiKernel G4AtlasToolsLib GeoModelInterfaces GeoMaterial2G4 TileSimEvent )
# Install files from the package:
atlas_install_python_modules( python/*.py )
diff --git a/TileCalorimeter/TileG4/TileAncillary/PhantomCalorimeter/CMakeLists.txt b/TileCalorimeter/TileG4/TileAncillary/PhantomCalorimeter/CMakeLists.txt
index dbbe1099c16..c0ee2e92536 100644
--- a/TileCalorimeter/TileG4/TileAncillary/PhantomCalorimeter/CMakeLists.txt
+++ b/TileCalorimeter/TileG4/TileAncillary/PhantomCalorimeter/CMakeLists.txt
@@ -26,7 +26,7 @@ atlas_add_component( PhantomCalorimeter
src/*.cc
src/components/*.cxx
INCLUDE_DIRS ${GEANT4_INCLUDE_DIRS} ${XERCESC_INCLUDE_DIRS} ${CLHEP_INCLUDE_DIRS} ${GEOMODELCORE_INCLUDE_DIRS}
- LINK_LIBRARIES ${GEANT4_LIBRARIES} ${XERCESC_LIBRARIES} ${CLHEP_LIBRARIES} ${GEOMODELCORE_LIBRARIES} CaloIdentifier StoreGateLib SGtests GaudiKernel G4AtlasToolsLib GeoMaterial2G4 TileSimEvent )
+ LINK_LIBRARIES ${GEANT4_LIBRARIES} ${XERCESC_LIBRARIES} ${CLHEP_LIBRARIES} ${GEOMODELCORE_LIBRARIES} CaloIdentifier StoreGateLib SGtests GaudiKernel G4AtlasToolsLib GeoMaterial2G4 GeoModelInterfaces TileSimEvent )
# Install files from the package:
atlas_install_python_modules( python/*.py )
diff --git a/TileCalorimeter/TileG4/TileG4Interfaces/CMakeLists.txt b/TileCalorimeter/TileG4/TileG4Interfaces/CMakeLists.txt
index d6441544b06..c1f91e064cc 100644
--- a/TileCalorimeter/TileG4/TileG4Interfaces/CMakeLists.txt
+++ b/TileCalorimeter/TileG4/TileG4Interfaces/CMakeLists.txt
@@ -14,6 +14,8 @@ atlas_depends_on_subdirs( PUBLIC
# External dependencies:
find_package( Geant4 )
-# Install files from the package:
-atlas_install_headers( TileG4Interfaces )
-
+atlas_add_library( TileG4InterfacesLib
+ TileG4Interfaces/*.h
+ INTERFACE
+ PUBLIC_HEADERS TileG4Interfaces
+ LINK_LIBRARIES GaudiKernel Identifier )
diff --git a/TileCalorimeter/TileG4/TileGeoG4Calib/CMakeLists.txt b/TileCalorimeter/TileG4/TileGeoG4Calib/CMakeLists.txt
index 1b181fa9763..1d25f541c04 100644
--- a/TileCalorimeter/TileG4/TileGeoG4Calib/CMakeLists.txt
+++ b/TileCalorimeter/TileG4/TileGeoG4Calib/CMakeLists.txt
@@ -39,7 +39,7 @@ atlas_add_component( TileGeoG4Calib
src/*.cc
src/components/*.cxx
INCLUDE_DIRS ${CORAL_INCLUDE_DIRS} ${Boost_INCLUDE_DIRS} ${XERCESC_INCLUDE_DIRS} ${GEANT4_INCLUDE_DIRS} ${CLHEP_INCLUDE_DIRS}
- LINK_LIBRARIES ${CORAL_LIBRARIES} ${Boost_LIBRARIES} ${XERCESC_LIBRARIES} ${GEANT4_LIBRARIES} ${CLHEP_LIBRARIES} CaloG4SimLib CaloIdentifier CaloSimEvent CxxUtils StoreGateLib SGtests GeoModelUtilities GaudiKernel G4AtlasToolsLib MCTruth TileDetDescr TileGeoG4SDLib TileSimEvent TileSimUtilsLib PathResolver )
+ LINK_LIBRARIES ${CORAL_LIBRARIES} ${Boost_LIBRARIES} ${XERCESC_LIBRARIES} ${GEANT4_LIBRARIES} ${CLHEP_LIBRARIES} CaloG4SimLib CaloIdentifier CaloSimEvent CxxUtils StoreGateLib SGtests GeoModelInterfaces GeoModelUtilities GaudiKernel G4AtlasToolsLib MCTruth TileDetDescr TileGeoG4SDLib TileG4InterfacesLib TileSimEvent TileSimUtilsLib PathResolver )
# Install files from the package:
atlas_install_python_modules( python/*.py )
diff --git a/TileCalorimeter/TileG4/TileGeoG4SD/CMakeLists.txt b/TileCalorimeter/TileG4/TileGeoG4SD/CMakeLists.txt
index 3808b9bca3c..773051757dd 100644
--- a/TileCalorimeter/TileG4/TileGeoG4SD/CMakeLists.txt
+++ b/TileCalorimeter/TileG4/TileGeoG4SD/CMakeLists.txt
@@ -35,8 +35,8 @@ atlas_add_library( TileGeoG4SDLib
INCLUDE_DIRS ${GEANT4_INCLUDE_DIRS} ${XERCESC_INCLUDE_DIRS}
PRIVATE_INCLUDE_DIRS ${CLHEP_INCLUDE_DIRS}
PRIVATE_DEFINITIONS ${CLHEP_DEFINITIONS}
- LINK_LIBRARIES ${GEANT4_LIBRARIES} ${XERCESC_LIBRARIES} TileDetDescr TileSimEvent
- PRIVATE_LINK_LIBRARIES ${CLHEP_LIBRARIES} CaloIdentifier CxxUtils GeoModelUtilities GaudiKernel PathResolver StoreGateLib SGtests CaloDetDescrLib G4AtlasToolsLib TileGeoModelLib )
+ LINK_LIBRARIES ${GEANT4_LIBRARIES} ${XERCESC_LIBRARIES} G4AtlasToolsLib TileDetDescr TileSimEvent TileG4InterfacesLib
+ PRIVATE_LINK_LIBRARIES ${CLHEP_LIBRARIES} CaloIdentifier CxxUtils GeoModelInterfaces GeoModelUtilities GaudiKernel PathResolver StoreGateLib SGtests CaloDetDescrLib TileGeoModelLib )
atlas_add_component( TileGeoG4SD
src/components/*.cxx
--
GitLab