diff --git a/Control/AthAnalysisBaseComps/CMakeLists.txt b/Control/AthAnalysisBaseComps/CMakeLists.txt
index d8c47bf00cc058bead3d8042318046593fca2fa7..8ad7bab86a4240a75c9f0ceb390f6e0a8170040d 100644
--- a/Control/AthAnalysisBaseComps/CMakeLists.txt
+++ b/Control/AthAnalysisBaseComps/CMakeLists.txt
@@ -14,7 +14,7 @@ atlas_add_library( AthAnalysisBaseCompsLib
INCLUDE_DIRS ${ROOT_INCLUDE_DIRS}
PRIVATE_INCLUDE_DIRS ${Boost_INCLUDE_DIRS}
LINK_LIBRARIES ${ROOT_LIBRARIES} AthenaBaseComps IOVDbDataModel GaudiKernel StoreGateLib AthContainers
- PRIVATE_LINK_LIBRARIES ${Boost_LIBRARIES} CxxUtils )
+ PRIVATE_LINK_LIBRARIES CxxUtils )
atlas_add_component( AthAnalysisBaseComps
src/components/*.cxx
diff --git a/Control/AthenaAuditors/CMakeLists.txt b/Control/AthenaAuditors/CMakeLists.txt
index f7ac6a44c60579c0159871dace9f095bf0cc55bd..2000269d76893fd673e9b17a77cc86ef9f2ae27d 100644
--- a/Control/AthenaAuditors/CMakeLists.txt
+++ b/Control/AthenaAuditors/CMakeLists.txt
@@ -15,5 +15,5 @@ atlas_add_component( AthenaAuditors
src/*.h src/*.cxx src/components/*.cxx
DEFINITIONS PACKAGE=AthenaAuditors
INCLUDE_DIRS ${Boost_INCLUDE_DIRS} ${GDB_INCLUDE_DIRS} ${LIBUNWIND_INCLUDE_DIRS} ${GPERFTOOLS_INCLUDE_DIRS} ${ZLIB_INCLUDE_DIRS}
- LINK_LIBRARIES ${Boost_LIBRARIES} ${GDB_LIBRARIES} ${LIBUNWIND_LIBRARIES} ${CMAKE_DL_LIBS} ${ZLIB_LIBRARIES}
+ LINK_LIBRARIES ${GDB_LIBRARIES} ${LIBUNWIND_LIBRARIES} ${CMAKE_DL_LIBS} ${ZLIB_LIBRARIES}
AthenaBaseComps AthenaKernel CxxUtils GaudiKernel )
diff --git a/Control/AthenaIPCTools/CMakeLists.txt b/Control/AthenaIPCTools/CMakeLists.txt
index 4da7169fcf9f571feff58ee0c5efa23f0ba3a7e7..a47ac2d81dd0a1ac20b34903cb967bfa458f0111 100644
--- a/Control/AthenaIPCTools/CMakeLists.txt
+++ b/Control/AthenaIPCTools/CMakeLists.txt
@@ -13,5 +13,5 @@ atlas_add_component( AthenaIPCTools
src/*.cxx
src/components/*.cxx
INCLUDE_DIRS ${Boost_INCLUDE_DIRS} ${YAMPL_INCLUDE_DIRS} ${HDF5_CXX_INCLUDE_DIRS}
- LINK_LIBRARIES ${Boost_LIBRARIES} ${YAMPL_LIBRARIES} ${HDF5_LIBRARIES} ${HDF5_CXX_LIBRARIES} AthenaBaseComps AthenaKernel GaudiKernel StorageSvc )
+ LINK_LIBRARIES ${YAMPL_LIBRARIES} ${HDF5_LIBRARIES} ${HDF5_CXX_LIBRARIES} AthenaBaseComps AthenaKernel GaudiKernel StorageSvc )
diff --git a/Control/AthenaInterprocess/CMakeLists.txt b/Control/AthenaInterprocess/CMakeLists.txt
index 930a75e505307e456fbfdf08386a16bd1c3adc1e..5e740319229f069344253fdf589307494bacb238 100644
--- a/Control/AthenaInterprocess/CMakeLists.txt
+++ b/Control/AthenaInterprocess/CMakeLists.txt
@@ -12,5 +12,5 @@ atlas_add_library( AthenaInterprocess
AthenaInterprocess/*.h src/*.cxx
PUBLIC_HEADERS AthenaInterprocess
INCLUDE_DIRS ${Boost_INCLUDE_DIRS} ${UUID_INCLUDE_DIRS}
- LINK_LIBRARIES ${Boost_LIBRARIES} ${UUID_LIBRARIES} AthenaKernel GaudiKernel
+ LINK_LIBRARIES ${UUID_LIBRARIES} AthenaKernel GaudiKernel
PRIVATE_LINK_LIBRARIES ${CMAKE_DL_LIBS} )
diff --git a/Control/AthenaMonitoring/CMakeLists.txt b/Control/AthenaMonitoring/CMakeLists.txt
index 38f80968017cbe5ed35a6ba550c2594e62848c9a..bf02855c215ce69c1d26f0e3303ee993228a7c06 100644
--- a/Control/AthenaMonitoring/CMakeLists.txt
+++ b/Control/AthenaMonitoring/CMakeLists.txt
@@ -30,7 +30,6 @@ atlas_add_library(
TrigDecisionToolLib
TrigNavToolsLib
PRIVATE_LINK_LIBRARIES
- ${Boost_LIBRARIES}
${CORAL_LIBRARIES}
AthenaKernel
CxxUtils
@@ -73,4 +72,4 @@ atlas_add_test( ExampleMonitorAlgorithm_online_test
SCRIPT test/test_unit_ExampleMonitorAlgorithm_online.sh
PROPERTIES TIMEOUT 300
POST_EXEC_SCRIPT nopost.sh
-)
\ No newline at end of file
+)
diff --git a/Control/Hephaestus/CMakeLists.txt b/Control/Hephaestus/CMakeLists.txt
index 9a2a1b03d8bc75e579eba88e84dba035a09ee634..a35135f7003739eb49e2917e7c5bd0e189dbda48 100644
--- a/Control/Hephaestus/CMakeLists.txt
+++ b/Control/Hephaestus/CMakeLists.txt
@@ -23,8 +23,7 @@ atlas_add_library( MemoryTracker
atlas_add_executable( hephprof
src/HephProf/HephProf.cxx
- INCLUDE_DIRS ${Boost_INCLUDE_DIRS}
- LINK_LIBRARIES ${Boost_LIBRARIES} )
+ INCLUDE_DIRS ${Boost_INCLUDE_DIRS})
# Construct the python loadable modules:
add_custom_command( TARGET MemoryTracker POST_BUILD
diff --git a/Control/PerformanceMonitoring/PerfMonComps/CMakeLists.txt b/Control/PerformanceMonitoring/PerfMonComps/CMakeLists.txt
index 5f6f8390ac89d402014237231c82f2187d35e1d4..a9354b6ca9c72406a9933357f1e373839a83e74c 100644
--- a/Control/PerformanceMonitoring/PerfMonComps/CMakeLists.txt
+++ b/Control/PerformanceMonitoring/PerfMonComps/CMakeLists.txt
@@ -18,7 +18,7 @@ atlas_add_component( PerfMonComps
src/*.cxx src/components/*.cxx
INCLUDE_DIRS ${AIDA_INCLUDE_DIRS} ${Boost_INCLUDE_DIRS} ${ROOT_INCLUDE_DIRS}
${Python_INCLUDE_DIRS} ${TBB_INCLUDE_DIRS}
- LINK_LIBRARIES ${Boost_LIBRARIES} ${ROOT_LIBRARIES} ${Python_LIBRARIES}
+ LINK_LIBRARIES ${ROOT_LIBRARIES} ${Python_LIBRARIES}
${CMAKE_DL_LIBS} ${TBB_LIBRARIES} AthenaBaseComps AthenaKernel RootUtilsPyROOT CxxUtils
PerfMonEvent PerfMonKernel SGTools StoreGateLib GaudiKernel
AthDSoCallBacks nlohmann_json::nlohmann_json)
diff --git a/Control/PerformanceMonitoring/PerfMonEvent/CMakeLists.txt b/Control/PerformanceMonitoring/PerfMonEvent/CMakeLists.txt
index d564a1e3b604d9cd8e39bb123b979197df591628..033bb6b0cd227ede3e7a2f977931d56d26f5ec92 100644
--- a/Control/PerformanceMonitoring/PerfMonEvent/CMakeLists.txt
+++ b/Control/PerformanceMonitoring/PerfMonEvent/CMakeLists.txt
@@ -25,7 +25,7 @@ atlas_add_library( PerfMonEvent
PUBLIC_HEADERS PerfMonEvent
INCLUDE_DIRS ${Python_INCLUDE_DIRS} ${Boost_INCLUDE_DIRS}
PRIVATE_INCLUDE_DIRS ${ROOT_INCLUDE_DIRS}
- LINK_LIBRARIES ${Python_LIBRARIES} ${Boost_LIBRARIES} CxxUtils GaudiKernel rt nlohmann_json::nlohmann_json CxxUtils
+ LINK_LIBRARIES ${Python_LIBRARIES} CxxUtils GaudiKernel rt nlohmann_json::nlohmann_json CxxUtils
PRIVATE_LINK_LIBRARIES ${ROOT_LIBRARIES} )
atlas_add_dictionary( PerfMonEventDict
diff --git a/HLT/Trigger/TrigControl/TrigPSC/CMakeLists.txt b/HLT/Trigger/TrigControl/TrigPSC/CMakeLists.txt
index 00f593c2f682e0b4c6fc18358602e257fa02cdd7..b2516a61bbc639aec19a12b5feb08aafb225ee67 100644
--- a/HLT/Trigger/TrigControl/TrigPSC/CMakeLists.txt
+++ b/HLT/Trigger/TrigControl/TrigPSC/CMakeLists.txt
@@ -15,7 +15,7 @@ atlas_add_library( TrigPSC
PUBLIC_HEADERS TrigPSC
INCLUDE_DIRS ${Boost_INCLUDE_DIRS} ${TDAQ-COMMON_INCLUDE_DIRS}
PRIVATE_INCLUDE_DIRS ${Python_INCLUDE_DIRS} ${ROOT_INCLUDE_DIRS}
- LINK_LIBRARIES ${Boost_LIBRARIES} ${TDAQ-COMMON_LIBRARIES} GaudiKernel
+ LINK_LIBRARIES ${TDAQ-COMMON_LIBRARIES} GaudiKernel
PRIVATE_LINK_LIBRARIES ${Python_LIBRARIES} ${ROOT_LIBRARIES} CxxUtils TrigKernel PathResolver )
# Install files from the package:
diff --git a/HighGranularityTimingDetector/HGTD_Reconstruction/HGTD_TrackingGeometry/CMakeLists.txt b/HighGranularityTimingDetector/HGTD_Reconstruction/HGTD_TrackingGeometry/CMakeLists.txt
index 7ebbd6b1da64df78ce0dc71c4d7fcd7a84cfc679..e7bf6e81c4c480a46fdcd1bf5223388c9bad8eb8 100644
--- a/HighGranularityTimingDetector/HGTD_Reconstruction/HGTD_TrackingGeometry/CMakeLists.txt
+++ b/HighGranularityTimingDetector/HGTD_Reconstruction/HGTD_TrackingGeometry/CMakeLists.txt
@@ -11,7 +11,7 @@ find_package( GeoModel COMPONENTS GeoModelKernel )
atlas_add_component( HGTD_TrackingGeometry
src/*.h src/*.cxx src/components/*.cxx
INCLUDE_DIRS ${Boost_INCLUDE_DIRS} ${GEOMODEL_INCLUDE_DIRS}
- LINK_LIBRARIES ${Boost_LIBRARIES} ${GEOMODEL_LIBRARIES} GaudiKernel
+ LINK_LIBRARIES ${GEOMODEL_LIBRARIES} GaudiKernel
AthenaKernel AthenaBaseComps CxxUtils StoreGateLib GeoPrimitives Identifier
TrkGeometry TrkSurfaces TrkVolumes TrkDetDescrInterfaces TrkDetDescrUtils
SubDetectorEnvelopesLib HGTD_ReadoutGeometry HGTD_Identifier )
diff --git a/InnerDetector/InDetConditions/SCT_ConditionsAlgorithms/CMakeLists.txt b/InnerDetector/InDetConditions/SCT_ConditionsAlgorithms/CMakeLists.txt
index b72f985fe7a5856b1bb8d1983e372abc3a5fb719..6533b80223d0201b3e31353b29e1bbb88abe4510 100644
--- a/InnerDetector/InDetConditions/SCT_ConditionsAlgorithms/CMakeLists.txt
+++ b/InnerDetector/InDetConditions/SCT_ConditionsAlgorithms/CMakeLists.txt
@@ -11,7 +11,7 @@ atlas_add_component( SCT_ConditionsAlgorithms
src/*.cxx
src/components/*.cxx
INCLUDE_DIRS ${Boost_INCLUDE_DIRS}
- LINK_LIBRARIES ${Boost_LIBRARIES} AthenaBaseComps AthenaKernel StoreGateLib Identifier DetDescrConditions GeoModelUtilities GeoPrimitives GaudiKernel SCT_ConditionsData SCT_CablingLib AthenaPoolUtilities InDetConditionsSummaryService InDetIdentifier InDetReadoutGeometry SCT_ReadoutGeometry TrkGeometry TrkSurfaces SCT_ConditionsToolsLib MuonReadoutGeometry TRT_ReadoutGeometry)
+ LINK_LIBRARIES AthenaBaseComps AthenaKernel StoreGateLib Identifier DetDescrConditions GeoModelUtilities GeoPrimitives GaudiKernel SCT_ConditionsData SCT_CablingLib AthenaPoolUtilities InDetConditionsSummaryService InDetIdentifier InDetReadoutGeometry SCT_ReadoutGeometry TrkGeometry TrkSurfaces SCT_ConditionsToolsLib MuonReadoutGeometry TRT_ReadoutGeometry)
# Helper functions for test definitions:
function( _add_athena_test name )
diff --git a/InnerDetector/InDetRecEvent/SiSPSeededTrackFinderData/CMakeLists.txt b/InnerDetector/InDetRecEvent/SiSPSeededTrackFinderData/CMakeLists.txt
index 1b726dc79d4353fdc94a993408ecf20b2d72fba3..7d17a87d344adfa7cecc34f0501b8668a03090b9 100644
--- a/InnerDetector/InDetRecEvent/SiSPSeededTrackFinderData/CMakeLists.txt
+++ b/InnerDetector/InDetRecEvent/SiSPSeededTrackFinderData/CMakeLists.txt
@@ -12,4 +12,4 @@ atlas_add_library( SiSPSeededTrackFinderData
PUBLIC_HEADERS SiSPSeededTrackFinderData
PRIVATE_INCLUDE_DIRS ${Boost_INCLUDE_DIRS}
LINK_LIBRARIES AthenaKernel InDetPrepRawData InDetReadoutGeometry SiSpacePointsSeed TrkEventPrimitives TrkExInterfaces TrkGeometry TrkPatternParameters TrkSurfaces TrkTrack TrkCaloClusterROI TrkToolInterfaces TrkEventUtils MagFieldElements MagFieldConditions InDetConditionsSummaryService xAODInDetMeasurement SiSpacePoint
- PRIVATE_LINK_LIBRARIES ${Boost_LIBRARIES} InDetRIO_OnTrack StoreGateLib TrkExUtils TrkMaterialOnTrack TrkPrepRawData TrkRIO_OnTrack TrkSpacePoint)
+ PRIVATE_LINK_LIBRARIES InDetRIO_OnTrack StoreGateLib TrkExUtils TrkMaterialOnTrack TrkPrepRawData TrkRIO_OnTrack TrkSpacePoint)
diff --git a/InnerDetector/InDetRecTools/InDetVKalVxInJetTool/CMakeLists.txt b/InnerDetector/InDetRecTools/InDetVKalVxInJetTool/CMakeLists.txt
index aab6a2a799106ffe19cde3191f8035ab3970b331..b17b5764db08100eff4fcfc3721f8b9f3cc588b4 100644
--- a/InnerDetector/InDetRecTools/InDetVKalVxInJetTool/CMakeLists.txt
+++ b/InnerDetector/InDetRecTools/InDetVKalVxInJetTool/CMakeLists.txt
@@ -13,7 +13,7 @@ atlas_add_library( InDetVKalVxInJetToolLib
src/*.cxx
PUBLIC_HEADERS InDetVKalVxInJetTool
INCLUDE_DIRS ${Boost_INCLUDE_DIRS} ${ROOT_INCLUDE_DIRS}
- LINK_LIBRARIES ${Boost_LIBRARIES} ${ROOT_LIBRARIES} AnalysisUtilsLib AthenaBaseComps BeamPipeGeoModelLib PixelReadoutGeometryLib CxxUtils GeoPrimitives InDetRecToolInterfaces MVAUtils PathResolver TrkNeutralParameters TrkToolInterfaces TrkVKalVrtFitterLib VxSecVertex xAODTracking xAODTruth xAODEventInfo xAODJet TestTools)
+ LINK_LIBRARIES ${ROOT_LIBRARIES} AnalysisUtilsLib AthenaBaseComps BeamPipeGeoModelLib PixelReadoutGeometryLib CxxUtils GeoPrimitives InDetRecToolInterfaces MVAUtils PathResolver TrkNeutralParameters TrkToolInterfaces TrkVKalVrtFitterLib VxSecVertex xAODTracking xAODTruth xAODEventInfo xAODJet TestTools)
atlas_add_component( InDetVKalVxInJetTool
src/components/*.cxx
diff --git a/InnerDetector/InDetRecTools/SiClusterizationTool/CMakeLists.txt b/InnerDetector/InDetRecTools/SiClusterizationTool/CMakeLists.txt
index 0b74902b064f41385568724c43d3b90c433d471a..851f3a7f14f112f9ab0c3958390d650d253f581f 100644
--- a/InnerDetector/InDetRecTools/SiClusterizationTool/CMakeLists.txt
+++ b/InnerDetector/InDetRecTools/SiClusterizationTool/CMakeLists.txt
@@ -22,7 +22,7 @@ atlas_add_library( SiClusterizationToolLib
BeamSpotConditionsData EventPrimitives GaudiKernel GeoPrimitives Identifier InDetCondTools InDetConditionsSummaryService
InDetIdentifier InDetPrepRawData InDetRawData ReadoutGeometryBase InDetReadoutGeometry SCT_ReadoutGeometry InDetRecToolInterfaces
InDetSimData PixelConditionsData PixelGeoModelLib PixelReadoutGeometryLib PoolSvcLib StoreGateLib TrkNeuralNetworkUtilsLib TrkParameters TrkSurfaces LwtnnUtils xAODInDetMeasurement
- PRIVATE_LINK_LIBRARIES ${Boost_LIBRARIES} ${COOL_LIBRARIES} AthenaPoolUtilities AtlasDetDescr AtlasHepMCLib DetDescrCondToolsLib FileCatalog TrkEventPrimitives VxVertex CxxUtils )
+ PRIVATE_LINK_LIBRARIES ${COOL_LIBRARIES} AthenaPoolUtilities AtlasDetDescr AtlasHepMCLib DetDescrCondToolsLib FileCatalog TrkEventPrimitives VxVertex CxxUtils )
atlas_add_component( SiClusterizationTool
src/components/*.cxx