diff --git a/Calorimeter/CaloClusterCorrection/CMakeLists.txt b/Calorimeter/CaloClusterCorrection/CMakeLists.txt
index 0893e2aadfb498860e5e15b4f14dd78d567ecef2..e7e788f4540431ac88a51432c6e80f817dbf8d53 100644
--- a/Calorimeter/CaloClusterCorrection/CMakeLists.txt
+++ b/Calorimeter/CaloClusterCorrection/CMakeLists.txt
@@ -48,7 +48,7 @@ atlas_add_library( CaloClusterCorrectionLib
atlas_add_component( CaloClusterCorrection
src/components/*.cxx
INCLUDE_DIRS ${ROOT_INCLUDE_DIRS} ${CLHEP_INCLUDE_DIRS}
- LINK_LIBRARIES ${ROOT_LIBRARIES} ${CLHEP_LIBRARIES} CaloCondBlobObjs CaloConditions CaloEvent CaloIdentifier CaloRecLib AthenaBaseComps AthenaKernel CxxUtils StoreGateLib SGtests AthenaPoolUtilities xAODCaloEvent GaudiKernel LArIdentifier LArToolsLib TestTools CaloDetDescrLib CaloGeoHelpers CaloUtilsLib DataModel Identifier EventKernel PathResolver CaloClusterCorrectionLib )
+ LINK_LIBRARIES CaloClusterCorrectionLib )
atlas_add_test( interpolate_test
SOURCES
diff --git a/Calorimeter/CaloDetDescr/CMakeLists.txt b/Calorimeter/CaloDetDescr/CMakeLists.txt
index 4e97035ef817367d43e8f2d12dcdbb585d639793..6598037436b82b64eacd6b0216059abb699ca0b8 100644
--- a/Calorimeter/CaloDetDescr/CMakeLists.txt
+++ b/Calorimeter/CaloDetDescr/CMakeLists.txt
@@ -40,7 +40,7 @@ atlas_add_library( CaloDetDescrLib
atlas_add_component( CaloDetDescr
src/components/*.cxx
INCLUDE_DIRS ${Boost_INCLUDE_DIRS} ${ROOT_INCLUDE_DIRS} ${EIGEN_INCLUDE_DIRS}
- LINK_LIBRARIES ${Boost_LIBRARIES} ${ROOT_LIBRARIES} ${EIGEN_LIBRARIES} CaloIdentifier AthenaBaseComps AthenaKernel AthContainers GeoPrimitives Identifier GaudiKernel LArReadoutGeometry CaloConditions CaloGeoHelpers StoreGateLib SGtests CaloDetDescrLib )
+ LINK_LIBRARIES CaloDetDescrLib )
atlas_add_dictionary( CaloDetDescrDict
CaloDetDescr/CaloDetDescrDict.h
diff --git a/Calorimeter/CaloTrackUtils/CMakeLists.txt b/Calorimeter/CaloTrackUtils/CMakeLists.txt
index 8408a37c1263214130994584e81403c40c06d17c..0196db4ddf4f3b676f4d2d15b66fee8700607dc9 100644
--- a/Calorimeter/CaloTrackUtils/CMakeLists.txt
+++ b/Calorimeter/CaloTrackUtils/CMakeLists.txt
@@ -36,5 +36,5 @@ atlas_add_library( CaloTrackUtilsLib
atlas_add_component( CaloTrackUtils
src/components/*.cxx
INCLUDE_DIRS ${ROOT_INCLUDE_DIRS} ${EIGEN_INCLUDE_DIRS}
- LINK_LIBRARIES ${ROOT_LIBRARIES} ${EIGEN_LIBRARIES} CaloRecLib GaudiKernel GeoPrimitives xAODCaloEvent Particle TrkSurfaces TrkParameters TrkParticleBase VxVertex TrkExInterfaces CaloTrackUtilsLib )
+ LINK_LIBRARIES CaloTrackUtilsLib )
diff --git a/Calorimeter/CaloTriggerTool/CMakeLists.txt b/Calorimeter/CaloTriggerTool/CMakeLists.txt
index 780266a7b1e429f67481c1592f17af8a91c04af2..f22da46d6186cb500e99a7e840691770cf6f333c 100644
--- a/Calorimeter/CaloTriggerTool/CMakeLists.txt
+++ b/Calorimeter/CaloTriggerTool/CMakeLists.txt
@@ -32,7 +32,7 @@ atlas_add_library( CaloTriggerToolLib
atlas_add_component( CaloTriggerTool
src/components/*.cxx
INCLUDE_DIRS ${ROOT_INCLUDE_DIRS}
- LINK_LIBRARIES ${ROOT_LIBRARIES} CaloIdentifier AthenaKernel StoreGateLib SGtests Identifier GaudiKernel TrigT1CaloCalibConditions AthenaBaseComps LArIdentifier LArToolsLib CaloTriggerToolLib )
+ LINK_LIBRARIES CaloTriggerToolLib )
atlas_add_dictionary( CaloTriggerToolDict
CaloTriggerTool/CaloTriggerToolDict.h
diff --git a/LArCalorimeter/LArBadChannelTool/CMakeLists.txt b/LArCalorimeter/LArBadChannelTool/CMakeLists.txt
index ef7f6dc084b22bd36cacc81b2ac326df05da4d9c..069bc40be5ad76df6dd65cfb70b9739b9179b268 100644
--- a/LArCalorimeter/LArBadChannelTool/CMakeLists.txt
+++ b/LArCalorimeter/LArBadChannelTool/CMakeLists.txt
@@ -36,7 +36,7 @@ atlas_add_library( LArBadChannelToolLib
atlas_add_component( LArBadChannelTool
src/components/*.cxx
INCLUDE_DIRS ${COOL_INCLUDE_DIRS} ${CORAL_INCLUDE_DIRS} ${ROOT_INCLUDE_DIRS}
- LINK_LIBRARIES ${COOL_LIBRARIES} ${CORAL_LIBRARIES} ${ROOT_LIBRARIES} CaloConditions CaloIdentifier AthenaBaseComps AthenaKernel StoreGateLib SGtests AthenaPoolUtilities Identifier GaudiKernel LArIdentifier LArRecConditions LArCablingLib LArBadChannelToolLib )
+ LINK_LIBRARIES LArBadChannelToolLib )
atlas_add_dictionary( BadChanDict
LArBadChannelTool/LArBadChannelDBToolsDict.h
diff --git a/LArCalorimeter/LArCabling/CMakeLists.txt b/LArCalorimeter/LArCabling/CMakeLists.txt
index 0ed172b727b67753ba94bee4d9c7f347550cd7be..3d0de4a753755794277b277a2d91d8e33097e641 100644
--- a/LArCalorimeter/LArCabling/CMakeLists.txt
+++ b/LArCalorimeter/LArCabling/CMakeLists.txt
@@ -33,7 +33,7 @@ atlas_add_library( LArCablingLib
atlas_add_component( LArCabling
src/components/*.cxx
INCLUDE_DIRS ${ROOT_INCLUDE_DIRS} ${CORAL_INCLUDE_DIRS}
- LINK_LIBRARIES ${ROOT_LIBRARIES} ${CORAL_LIBRARIES} CaloIdentifier AthenaBaseComps AthenaKernel StoreGateLib SGtests AthenaPoolUtilities Identifier GaudiKernel LArIdentifier PathResolver LArCablingLib )
+ LINK_LIBRARIES LArCablingLib )
atlas_add_dictionary( LArCablingDict
LArCabling/LArCablingDict.h
diff --git a/LArCalorimeter/LArDigitization/CMakeLists.txt b/LArCalorimeter/LArDigitization/CMakeLists.txt
index 0597049375bbcf9686cd3aab2f3c8a47d3310e0c..0343fdb4e11e2ea0400d6463d416a7d2292ace3f 100644
--- a/LArCalorimeter/LArDigitization/CMakeLists.txt
+++ b/LArCalorimeter/LArDigitization/CMakeLists.txt
@@ -22,10 +22,11 @@ atlas_depends_on_subdirs( PUBLIC
LArCalorimeter/LArElecCalib
LArCalorimeter/LArIdentifier
LArCalorimeter/LArRawEvent
+ LArCalorimeter/LArSimEvent
LArCalorimeter/LArRecConditions
PRIVATE
- Generators/GeneratorObjects
- LArCalorimeter/LArSimEvent )
+ Generators/GeneratorObjects )
+
# External dependencies:
find_package( CLHEP )
@@ -37,13 +38,13 @@ atlas_add_library( LArDigitizationLib
PUBLIC_HEADERS LArDigitization
PRIVATE_INCLUDE_DIRS ${CLHEP_INCLUDE_DIRS} ${HEPMC_INCLUDE_DIRS}
PRIVATE_DEFINITIONS ${CLHEP_DEFINITIONS}
- LINK_LIBRARIES CaloIdentifier AthenaBaseComps AthenaKernel SGTools Identifier xAODEventInfo GaudiKernel LArIdentifier LArRawEvent LArRecConditions CaloDetDescrLib PileUpToolsLib StoreGateLib SGtests LArCablingLib
- PRIVATE_LINK_LIBRARIES ${CLHEP_LIBRARIES} ${HEPMC_LIBRARIES} GeneratorObjects LArSimEvent )
+ LINK_LIBRARIES CaloIdentifier AthenaBaseComps AthenaKernel SGTools Identifier xAODEventInfo GaudiKernel LArIdentifier LArRawEvent LArSimEvent LArRecConditions CaloDetDescrLib PileUpToolsLib StoreGateLib SGtests LArCablingLib
+ PRIVATE_LINK_LIBRARIES ${CLHEP_LIBRARIES} ${HEPMC_LIBRARIES} GeneratorObjects )
atlas_add_component( LArDigitization
src/components/*.cxx
INCLUDE_DIRS ${CLHEP_INCLUDE_DIRS} ${HEPMC_INCLUDE_DIRS}
- LINK_LIBRARIES ${CLHEP_LIBRARIES} ${HEPMC_LIBRARIES} CaloDetDescrLib CaloIdentifier AthenaBaseComps AthenaKernel PileUpToolsLib SGTools StoreGateLib SGtests Identifier xAODEventInfo GaudiKernel LArCablingLib LArIdentifier LArRawEvent LArRecConditions GeneratorObjects LArSimEvent LArDigitizationLib )
+ LINK_LIBRARIES LArDigitizationLib )
# Install files from the package:
atlas_install_python_modules( python/*.py )
diff --git a/LArCalorimeter/LArG4/LArG4GenShowerLib/CMakeLists.txt b/LArCalorimeter/LArG4/LArG4GenShowerLib/CMakeLists.txt
index 2f36a254470440ef867f43b5f5a113a3ac47cd0b..9c34395d1a475909d01f35fc0f76de908a71b05d 100644
--- a/LArCalorimeter/LArG4/LArG4GenShowerLib/CMakeLists.txt
+++ b/LArCalorimeter/LArG4/LArG4GenShowerLib/CMakeLists.txt
@@ -41,7 +41,7 @@ atlas_add_library( LArG4GenShowerLibLib
atlas_add_component( LArG4GenShowerLib
src/components/*.cxx
INCLUDE_DIRS ${XERCESC_INCLUDE_DIRS} ${GEANT4_INCLUDE_DIRS} ${ROOT_INCLUDE_DIRS} ${CLHEP_INCLUDE_DIRS}
- LINK_LIBRARIES ${XERCESC_LIBRARIES} ${GEANT4_LIBRARIES} ${ROOT_LIBRARIES} ${CLHEP_LIBRARIES} AthenaBaseComps DataModel SGTools GaudiKernel G4AtlasToolsLib EventInfo GeneratorObjects LArG4Code LArG4ShowerLib LArG4GenShowerLibLib )
+ LINK_LIBRARIES LArG4GenShowerLibLib )
atlas_add_dictionary( LArG4GenShowerLibDict
LArG4GenShowerLib/LArG4GenShowerLibDict.h
diff --git a/LArCalorimeter/LArGeoModel/LArGeoTBEC/CMakeLists.txt b/LArCalorimeter/LArGeoModel/LArGeoTBEC/CMakeLists.txt
index 897ab51f6ad20904c52af869de79d81ecf756b51..9e0397980963b71455a575d5a2d6e8f2b0c69b43 100644
--- a/LArCalorimeter/LArGeoModel/LArGeoTBEC/CMakeLists.txt
+++ b/LArCalorimeter/LArGeoModel/LArGeoTBEC/CMakeLists.txt
@@ -38,5 +38,5 @@ atlas_add_library( LArGeoTBECLib
atlas_add_component( LArGeoTBEC
src/components/*.cxx
INCLUDE_DIRS ${Boost_INCLUDE_DIRS} ${CORAL_INCLUDE_DIRS} ${CLHEP_INCLUDE_DIRS}
- LINK_LIBRARIES ${Boost_LIBRARIES} ${CORAL_LIBRARIES} ${CLHEP_LIBRARIES} GeoModelKernel GeoModelUtilities LArReadoutGeometry StoreGateLib SGtests GeoSpecialShapes GaudiKernel LArG4RunControl LArGeoCode LArGeoEndcap LArGeoRAL LArGeoTBECLib )
+ LINK_LIBRARIES LArGeoTBECLib )
diff --git a/LArCalorimeter/LArROD/CMakeLists.txt b/LArCalorimeter/LArROD/CMakeLists.txt
index eb877eebad9269007e56f9f1c28490b91d92ab22..d113f7f1f9c2b69902029b56c94ef60b8ba1ce18 100644
--- a/LArCalorimeter/LArROD/CMakeLists.txt
+++ b/LArCalorimeter/LArROD/CMakeLists.txt
@@ -49,7 +49,7 @@ atlas_add_library( LArRODLib
atlas_add_component( LArROD
src/components/*.cxx
INCLUDE_DIRS ${ROOT_INCLUDE_DIRS} ${CLHEP_INCLUDE_DIRS}
- LINK_LIBRARIES ${ROOT_LIBRARIES} ${CLHEP_LIBRARIES} CaloIdentifier AthenaBaseComps StoreGateLib SGtests Identifier GaudiKernel LArCablingLib LArIdentifier LArRawConditions LArRawEvent LArRawUtilsLib LArRecConditions LArRecUtilsLib TBEvent CaloDetDescrLib CaloEvent CommissionEvent AthContainers AthenaPoolUtilities EventInfo LArCOOLConditions LArRODLib )
+ LINK_LIBRARIES LArRODLib )
# Install files from the package:
atlas_install_python_modules( python/*.py )
diff --git a/LArCalorimeter/LArRawUtils/CMakeLists.txt b/LArCalorimeter/LArRawUtils/CMakeLists.txt
index 8def89c3510d10ebaa368a73f5c7cb52f7fc11b7..6c50362e9210db794ebafff993864b00cc355252 100644
--- a/LArCalorimeter/LArRawUtils/CMakeLists.txt
+++ b/LArCalorimeter/LArRawUtils/CMakeLists.txt
@@ -30,5 +30,5 @@ atlas_add_library( LArRawUtilsLib
atlas_add_component( LArRawUtils
src/components/*.cxx
- LINK_LIBRARIES CaloIdentifier CaloTTDetDescr AthenaBaseComps AthenaKernel StoreGateLib SGtests Identifier GaudiKernel LArIdentifier LArRawEvent CaloTriggerToolLib AtlasDetDescr LArToolsLib LArRawUtilsLib )
+ LINK_LIBRARIES LArRawUtilsLib )
diff --git a/LArCalorimeter/LArTools/CMakeLists.txt b/LArCalorimeter/LArTools/CMakeLists.txt
index 510d25fa32a1516ef78d997a01bef7fa0067657c..181d46f5760402c61d1093abf4650b07fb91c9bf 100644
--- a/LArCalorimeter/LArTools/CMakeLists.txt
+++ b/LArCalorimeter/LArTools/CMakeLists.txt
@@ -33,7 +33,7 @@ atlas_add_library( LArToolsLib
atlas_add_component( LArTools
src/components/*.cxx
INCLUDE_DIRS ${ROOT_INCLUDE_DIRS} ${CORAL_INCLUDE_DIRS}
- LINK_LIBRARIES ${ROOT_LIBRARIES} ${CORAL_LIBRARIES} AthenaBaseComps AthenaKernel Identifier GaudiKernel LArCablingLib CaloIdentifier AthenaPoolUtilities LArRecConditions LArToolsLib )
+ LINK_LIBRARIES LArToolsLib )
atlas_add_dictionary( LArToolsDict
LArTools/LArToolsDict.h
diff --git a/TileCalorimeter/TileConditions/CMakeLists.txt b/TileCalorimeter/TileConditions/CMakeLists.txt
index 4040ee203587910689f257d48c7b3a702c5c56b1..fbb558a81d1bd5206a2f1f4bf56423e207a09082 100644
--- a/TileCalorimeter/TileConditions/CMakeLists.txt
+++ b/TileCalorimeter/TileConditions/CMakeLists.txt
@@ -50,7 +50,7 @@ atlas_add_library( TileConditionsLib
atlas_add_component( TileConditions
src/components/*.cxx
INCLUDE_DIRS ${Boost_INCLUDE_DIRS} ${CORAL_INCLUDE_DIRS} ${ROOT_INCLUDE_DIRS} ${CLHEP_INCLUDE_DIRS}
- LINK_LIBRARIES ${Boost_LIBRARIES} ${CORAL_LIBRARIES} ${ROOT_LIBRARIES} ${CLHEP_LIBRARIES} CaloConditions CaloIdentifier AthenaBaseComps AthenaKernel SGTools StoreGateLib SGtests AthenaPoolUtilities Identifier GaudiKernel TileCalibBlobObjs TileIdentifier CaloDetDescrLib TileDetDescr PathResolver TileConditionsLib )
+ LINK_LIBRARIES TileConditionsLib )
atlas_add_dictionary( TileConditionsDict
TileConditions/TileConditionsDict.h
diff --git a/TileCalorimeter/TileG4/TileGeoG4SD/CMakeLists.txt b/TileCalorimeter/TileG4/TileGeoG4SD/CMakeLists.txt
index 59a4403f6b267b3cae53dd1ea7b9bb8e883648cc..baa30e765d040e6329d2c1aa989928b4fbb479f1 100644
--- a/TileCalorimeter/TileG4/TileGeoG4SD/CMakeLists.txt
+++ b/TileCalorimeter/TileG4/TileGeoG4SD/CMakeLists.txt
@@ -41,7 +41,7 @@ atlas_add_library( TileGeoG4SDLib
atlas_add_component( TileGeoG4SD
src/components/*.cxx
INCLUDE_DIRS ${GEANT4_INCLUDE_DIRS} ${XERCESC_INCLUDE_DIRS} ${CLHEP_INCLUDE_DIRS}
- LINK_LIBRARIES ${GEANT4_LIBRARIES} ${XERCESC_LIBRARIES} ${CLHEP_LIBRARIES} CaloIdentifier StoreGateLib SGtests TileDetDescr TileSimEvent CaloDetDescrLib CxxUtils GeoModelUtilities GaudiKernel G4AtlasToolsLib TileGeoModelLib PathResolver TileGeoG4SDLib )
+ LINK_LIBRARIES TileGeoG4SDLib )
# Install files from the package:
atlas_install_python_modules( python/*.py )
diff --git a/TileCalorimeter/TileGeoModel/CMakeLists.txt b/TileCalorimeter/TileGeoModel/CMakeLists.txt
index c545c92f323f1b173684eff0373a42ca4fcca445..d27e4c90d3f30649d19b019d3114cd707b49a7c1 100644
--- a/TileCalorimeter/TileGeoModel/CMakeLists.txt
+++ b/TileCalorimeter/TileGeoModel/CMakeLists.txt
@@ -39,7 +39,7 @@ atlas_add_library( TileGeoModelLib
atlas_add_component( TileGeoModel
src/components/*.cxx
INCLUDE_DIRS ${Boost_INCLUDE_DIRS} ${CORAL_INCLUDE_DIRS} ${CLHEP_INCLUDE_DIRS}
- LINK_LIBRARIES ${Boost_LIBRARIES} ${CORAL_LIBRARIES} ${CLHEP_LIBRARIES} StoreGateLib SGtests GeoModelKernel GeoModelUtilities TileDetDescr CaloDetDescrLib CaloIdentifier SGTools GaudiKernel TileConditionsLib TileIdentifier TileGeoModelLib )
+ LINK_LIBRARIES TileGeoModelLib )
# Install files from the package:
diff --git a/TileCalorimeter/TileL2Algs/CMakeLists.txt b/TileCalorimeter/TileL2Algs/CMakeLists.txt
index 0d2d01069abe89cdd673ecc09392c61496a0bc98..443b205cf10c491bf89511d11446a2b6545d0624 100644
--- a/TileCalorimeter/TileL2Algs/CMakeLists.txt
+++ b/TileCalorimeter/TileL2Algs/CMakeLists.txt
@@ -28,7 +28,7 @@ atlas_add_library( TileL2AlgsLib
atlas_add_component( TileL2Algs
src/components/*.cxx
- LINK_LIBRARIES AthenaBaseComps GaudiKernel TileEvent TileIdentifier CaloDetDescrLib CaloIdentifier AthenaKernel TileCalibBlobObjs TileConditionsLib TileDetDescr TileL2AlgsLib )
+ LINK_LIBRARIES TileL2AlgsLib )
# Install files from the package:
atlas_install_python_modules( python/*.py )
diff --git a/TileCalorimeter/TileRecUtils/CMakeLists.txt b/TileCalorimeter/TileRecUtils/CMakeLists.txt
index 282750592704753e9db8a36824b52efb370a62b5..9fecd97f772c27151baa5bc87cea77f85c60e75b 100644
--- a/TileCalorimeter/TileRecUtils/CMakeLists.txt
+++ b/TileCalorimeter/TileRecUtils/CMakeLists.txt
@@ -47,7 +47,7 @@ atlas_add_library( TileRecUtilsLib
atlas_add_component( TileRecUtils
src/components/*.cxx
INCLUDE_DIRS ${Boost_INCLUDE_DIRS} ${CLHEP_INCLUDE_DIRS}
- LINK_LIBRARIES ${Boost_LIBRARIES} ${CLHEP_LIBRARIES} CaloConditions CaloIdentifier CaloUtilsLib AthenaBaseComps AthenaKernel Identifier GaudiKernel TileConditionsLib TileEvent TileSimEvent TileIdentifier CaloDetDescrLib CaloEvent AthAllocators StoreGateLib SGtests xAODEventInfo TileCalibBlobObjs TileDetDescr PathResolver TileRecUtilsLib )
+ LINK_LIBRARIES TileRecUtilsLib )
# Install files from the package:
atlas_install_python_modules( python/*.py )
diff --git a/TileCalorimeter/TileSimUtils/CMakeLists.txt b/TileCalorimeter/TileSimUtils/CMakeLists.txt
index 070ec29f917f9d35310f92a89a31f0a1469449b5..9a34e0affc3a41bccb2cd8b620dc7f5232d2d21f 100644
--- a/TileCalorimeter/TileSimUtils/CMakeLists.txt
+++ b/TileCalorimeter/TileSimUtils/CMakeLists.txt
@@ -34,7 +34,7 @@ atlas_add_library( TileSimUtilsLib
atlas_add_component( TileSimUtils
src/components/*.cxx
INCLUDE_DIRS ${ROOT_INCLUDE_DIRS}
- LINK_LIBRARIES ${ROOT_LIBRARIES} CaloIdentifier CaloSimEvent AthenaBaseComps SGTools GaudiKernel AthenaKernel StoreGateLib SGtests TileSimUtilsLib )
+ LINK_LIBRARIES TileSimUtilsLib )
# Install files from the package:
atlas_install_python_modules( python/*.py )