diff --git a/Control/PileUpComps/CMakeLists.txt b/Control/PileUpComps/CMakeLists.txt
index 581f3fb2a5c27388a51e7ca23408da13e49af9ae..d16a3666077bb0b87a60b7996ae7872d8da556ee 100644
--- a/Control/PileUpComps/CMakeLists.txt
+++ b/Control/PileUpComps/CMakeLists.txt
@@ -7,12 +7,13 @@ atlas_subdir( PileUpComps )
# External dependencies:
find_package( CLHEP )
+find_package( Boost )
# Component(s) in the package:
atlas_add_component( PileUpComps
src/*.cxx
src/components/*.cxx
- INCLUDE_DIRS ${CLHEP_INCLUDE_DIRS}
+ INCLUDE_DIRS ${CLHEP_INCLUDE_DIRS} ${BOOST_INCLUDE_DIRS}
LINK_LIBRARIES
${CLHEP_LIBRARIES} AthenaBaseComps AthenaKernel
PileUpToolsLib StoreGateLib EventInfo
diff --git a/Database/APR/APRTests/CMakeLists.txt b/Database/APR/APRTests/CMakeLists.txt
index 33d863428866f66f598913692a40dd3c23e94943..859352f53aa2b36ef8f46ba67d29b29a358aac79 100644
--- a/Database/APR/APRTests/CMakeLists.txt
+++ b/Database/APR/APRTests/CMakeLists.txt
@@ -6,7 +6,6 @@ atlas_subdir( APRTests )
# External dependencies:
find_package( CppUnit )
find_package( ROOT )
-find_package( Boost )
# Extend the include directories for all components:
include_directories( ${CMAKE_CURRENT_SOURCE_DIR}/TestDictionary )
@@ -24,8 +23,7 @@ function( _add_test name )
if( ARG_DICTHEADER )
atlas_add_dictionary( test_${name}Dict
${ARG_DICTHEADER} ${name}/classes.xml
- INCLUDE_DIRS ${Boost_INCLUDE_DIRS}
- LINK_LIBRARIES ${Boost_LIBRARIES} PersistencySvc
+ LINK_LIBRARIES PersistencySvc
StorageSvc AthContainers
NO_ROOTMAP_MERGE )
endif()
diff --git a/LArCalorimeter/LArMonTools/CMakeLists.txt b/LArCalorimeter/LArMonTools/CMakeLists.txt
index 1ae69b5dee04e5fbbe13e9bb27add02e24894892..ff067e997615fed2ecb041a9fc7ac51b2982fa3f 100644
--- a/LArCalorimeter/LArMonTools/CMakeLists.txt
+++ b/LArCalorimeter/LArMonTools/CMakeLists.txt
@@ -4,7 +4,6 @@
atlas_subdir( LArMonTools )
# External dependencies:
-find_package( Boost )
find_package( CLHEP )
find_package( ROOT COMPONENTS Core Tree MathCore Hist RIO )
@@ -12,8 +11,8 @@ find_package( ROOT COMPONENTS Core Tree MathCore Hist RIO )
atlas_add_component( LArMonTools
src/*.cxx
src/components/*.cxx
- INCLUDE_DIRS ${ROOT_INCLUDE_DIRS} ${Boost_INCLUDE_DIRS} ${CLHEP_INCLUDE_DIRS}
- LINK_LIBRARIES ${ROOT_LIBRARIES} ${Boost_LIBRARIES} ${CLHEP_LIBRARIES} CaloDetDescrLib CaloGeoHelpers CaloIdentifier EventContainers AthenaMonitoringLib StoreGateLib Identifier GaudiKernel LArIdentifier LArRawEvent LArRecConditions LArCablingLib LWHists TrigDecisionToolLib CaloConditions AthenaKernel AthenaPoolUtilities xAODEventInfo LArCOOLConditions LArRawConditions LArRecEvent CaloInterfaceLib LArElecCalib TrigAnalysisInterfaces )
+ INCLUDE_DIRS ${ROOT_INCLUDE_DIRS} ${CLHEP_INCLUDE_DIRS}
+ LINK_LIBRARIES ${ROOT_LIBRARIES} ${CLHEP_LIBRARIES} CaloDetDescrLib CaloGeoHelpers CaloIdentifier EventContainers AthenaMonitoringLib StoreGateLib Identifier GaudiKernel LArIdentifier LArRawEvent LArRecConditions LArCablingLib LWHists TrigDecisionToolLib CaloConditions AthenaKernel AthenaPoolUtilities xAODEventInfo LArCOOLConditions LArRawConditions LArRecEvent CaloInterfaceLib LArElecCalib TrigAnalysisInterfaces )
# Install files from the package:
atlas_install_python_modules( python/*.py POST_BUILD_CMD ${ATLAS_FLAKE8} )
diff --git a/MuonSpectrometer/MuonGeoModelTest/CMakeLists.txt b/MuonSpectrometer/MuonGeoModelTest/CMakeLists.txt
index e5ae5de59e397ddf0a1cac2c7223a53d15d32a87..b6c0a9d1f9feac92edb34e4c4f520ba2f314574f 100644
--- a/MuonSpectrometer/MuonGeoModelTest/CMakeLists.txt
+++ b/MuonSpectrometer/MuonGeoModelTest/CMakeLists.txt
@@ -6,23 +6,22 @@
atlas_subdir( MuonGeoModelTest )
# External dependencies:
-find_package( Boost )
find_package( ROOT COMPONENTS Core Tree MathCore Hist RIO pthread )
# Component(s) in the package:
atlas_add_library( MuonGeoModelTestLib
src/*.cxx
PUBLIC_HEADERS MuonGeoModelTest
- PRIVATE_INCLUDE_DIRS ${ROOT_INCLUDE_DIRS} ${Boost_INCLUDE_DIRS}
+ PRIVATE_INCLUDE_DIRS ${ROOT_INCLUDE_DIRS}
LINK_LIBRARIES AthenaBaseComps Identifier GaudiKernel MuonCalibITools MuonReadoutGeometry MuonCondData
MuonPrepRawData MuonSimEvent MuonIdHelpersLib StoreGateLib RegionSelectorLib MuonTesterTreeLib
- PRIVATE_LINK_LIBRARIES ${ROOT_LIBRARIES} ${Boost_LIBRARIES} GeoAdaptors GeoPrimitives GeneratorObjects
+ PRIVATE_LINK_LIBRARIES ${ROOT_LIBRARIES} GeoAdaptors GeoPrimitives GeneratorObjects
MuonAlignmentData MuonDigitContainer TrkDistortedSurfaces TrkSurfaces )
atlas_add_component( MuonGeoModelTest
src/components/*.cxx
- INCLUDE_DIRS ${ROOT_INCLUDE_DIRS} ${Boost_INCLUDE_DIRS}
- LINK_LIBRARIES ${ROOT_LIBRARIES} ${Boost_LIBRARIES} AthenaBaseComps Identifier GaudiKernel
+ INCLUDE_DIRS ${ROOT_INCLUDE_DIRS}
+ LINK_LIBRARIES ${ROOT_LIBRARIES} AthenaBaseComps Identifier GaudiKernel
MuonCalibITools MuonReadoutGeometry MuonIdHelpersLib MuonPrepRawData MuonSimEvent
StoreGateLib GeoAdaptors GeoPrimitives RegionSelectorLib GeneratorObjects MuonCondData
MuonAlignmentData MuonDigitContainer TrkDistortedSurfaces TrkSurfaces MuonGeoModelTestLib )
diff --git a/PhysicsAnalysis/ElectronPhotonID/EGammaVariableCorrection/CMakeLists.txt b/PhysicsAnalysis/ElectronPhotonID/EGammaVariableCorrection/CMakeLists.txt
index ce796458a0bd3d5256952cc935bf3b533b9d9840..f9df4eb6e0a13c3e99a8d3dba0c17e086a0ff72c 100644
--- a/PhysicsAnalysis/ElectronPhotonID/EGammaVariableCorrection/CMakeLists.txt
+++ b/PhysicsAnalysis/ElectronPhotonID/EGammaVariableCorrection/CMakeLists.txt
@@ -5,15 +5,14 @@ atlas_subdir( EGammaVariableCorrection )
# External dependencies:
find_package( ROOT COMPONENTS Core MathCore Hist Graf RIO )
-find_package( Boost COMPONENTS thread )
# Component(s) in the package:
atlas_add_library( EGammaVariableCorrectionLib
EGammaVariableCorrection/*.h
Root/*.cxx
PUBLIC_HEADERS EGammaVariableCorrection
- INCLUDE_DIRS ${Boost_INCLUDE_DIRS} ${ROOT_INCLUDE_DIRS}
- LINK_LIBRARIES ${Boost_LIBRARIES} ${ROOT_LIBRARIES} AsgTools EgammaAnalysisInterfacesLib EgammaAnalysisHelpersLib
+ INCLUDE_DIRS ${ROOT_INCLUDE_DIRS}
+ LINK_LIBRARIES ${ROOT_LIBRARIES} AsgTools EgammaAnalysisInterfacesLib EgammaAnalysisHelpersLib
PRIVATE_LINK_LIBRARIES PathResolver xAODEgamma xAODEventShape)
if( NOT XAOD_STANDALONE )
diff --git a/PhysicsAnalysis/JetTagging/JetTagInfo/CMakeLists.txt b/PhysicsAnalysis/JetTagging/JetTagInfo/CMakeLists.txt
index a1800448c5561e5b63a0cb68b2a7eed34693b8ea..3e5ba9f3b22a626ad67717a1ab11a655c60fc230 100644
--- a/PhysicsAnalysis/JetTagging/JetTagInfo/CMakeLists.txt
+++ b/PhysicsAnalysis/JetTagging/JetTagInfo/CMakeLists.txt
@@ -3,16 +3,12 @@
# Declare the package name:
atlas_subdir( JetTagInfo )
-# External dependencies:
-find_package( Boost )
-
# Component(s) in the package:
atlas_add_library( JetTagInfo
src/*.cxx
PUBLIC_HEADERS JetTagInfo
- PRIVATE_INCLUDE_DIRS ${Boost_INCLUDE_DIRS}
LINK_LIBRARIES AthLinks EventPrimitives JetEvent muonEvent Particle egammaEvent VxVertex
- PRIVATE_LINK_LIBRARIES ${Boost_LIBRARIES} GaudiKernel )
+ PRIVATE_LINK_LIBRARIES GaudiKernel )
atlas_add_dictionary( JetTagInfoDict
JetTagInfo/JetTagInfoDict.h
diff --git a/Reconstruction/VKalVrt/VrtSecInclusive/CMakeLists.txt b/Reconstruction/VKalVrt/VrtSecInclusive/CMakeLists.txt
index b8992dcca58e5793af67e9ccaf82eb6e4cdb9afb..0cb01a9c1f3cede551cf11700369cc50e4abfcb0 100644
--- a/Reconstruction/VKalVrt/VrtSecInclusive/CMakeLists.txt
+++ b/Reconstruction/VKalVrt/VrtSecInclusive/CMakeLists.txt
@@ -6,7 +6,6 @@ atlas_subdir( VrtSecInclusive )
# External dependencies:
find_package( LAPACK )
find_package( BLAS )
-find_package( Boost )
find_package( ROOT COMPONENTS Core Tree MathCore Hist RIO pthread )
# Component(s) in the package:
diff --git a/Trigger/TrigTools/TrigInDetPattRecoTools/CMakeLists.txt b/Trigger/TrigTools/TrigInDetPattRecoTools/CMakeLists.txt
index 86f1bbc4d1f1d0eb93f8be309701d64f25746614..c23f695b3435addf2eee7626065684e3ae1cc5b5 100644
--- a/Trigger/TrigTools/TrigInDetPattRecoTools/CMakeLists.txt
+++ b/Trigger/TrigTools/TrigInDetPattRecoTools/CMakeLists.txt
@@ -10,7 +10,6 @@ atlas_add_library( TrigInDetPattRecoTools
LINK_LIBRARIES TrigInDetPattRecoEvent
PRIVATE_LINK_LIBRARIES IRegionSelector TrigInDetEvent InDetPrepRawData BeamSpotConditionsData)
-find_package(Boost)
atlas_add_test( mockSeeds
SOURCES test/mockSeeds.cxx