diff --git a/Control/AthAllocators/CMakeLists.txt b/Control/AthAllocators/CMakeLists.txt
index 59c14870c6fbd83ef6b4d57b1f40ede1b752c9f8..175553176c3deec7667daef4e270b2cd890c5d21 100644
--- a/Control/AthAllocators/CMakeLists.txt
+++ b/Control/AthAllocators/CMakeLists.txt
@@ -1,18 +1,8 @@
-################################################################################
-# Package: AthAllocators
-################################################################################
+# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
# Declare the package name:
atlas_subdir( AthAllocators )
-# Declare the package's dependencies:
-atlas_depends_on_subdirs(
- PUBLIC
- GaudiKernel
- PRIVATE
- Control/CxxUtils
- AtlasTest/TestTools )
-
# External dependencies:
find_package( Boost COMPONENTS thread )
diff --git a/Control/AthAnalysisBaseComps/CMakeLists.txt b/Control/AthAnalysisBaseComps/CMakeLists.txt
index 4b171ae550f0fd62d8b4c2fb7c7e378c357a4345..c13ebc8ff61880e49fd774eb2bf22fc1d3033bbb 100644
--- a/Control/AthAnalysisBaseComps/CMakeLists.txt
+++ b/Control/AthAnalysisBaseComps/CMakeLists.txt
@@ -1,18 +1,8 @@
-################################################################################
-# Package: AthAnalysisBaseComps
-################################################################################
+# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
# Declare the package name:
atlas_subdir( AthAnalysisBaseComps )
-# Declare the package's dependencies:
-atlas_depends_on_subdirs( PUBLIC
- Control/AthenaBaseComps
- Control/StoreGate
- Control/AthContainers
- Database/IOVDbDataModel
- GaudiKernel )
-
# External dependencies:
find_package( ROOT COMPONENTS Core Tree MathCore Hist RIO pthread )
@@ -26,15 +16,12 @@ atlas_add_library( AthAnalysisBaseCompsLib
atlas_add_component( AthAnalysisBaseComps
src/components/*.cxx
- PRIVATE_INCLUDE_DIRS ${ROOT_INCLUDE_DIRS}
- LINK_LIBRARIES AthenaBaseComps IOVDbDataModel GaudiKernel StoreGateLib SGtests AthContainers AthAnalysisBaseCompsLib
- PRIVATE_LINK_LIBRARIES ${ROOT_LIBRARIES})
+ LINK_LIBRARIES AthAnalysisBaseCompsLib )
atlas_add_dictionary( AthAnalysisBaseCompsDict
AthAnalysisBaseComps/AthAnalysisBaseCompsDict.h
AthAnalysisBaseComps/selection.xml
- INCLUDE_DIRS ${ROOT_INCLUDE_DIRS}
- LINK_LIBRARIES ${ROOT_LIBRARIES} AthenaBaseComps StoreGateLib SGtests IOVDbDataModel GaudiKernel AthContainers AthAnalysisBaseCompsLib )
+ LINK_LIBRARIES AthAnalysisBaseCompsLib )
# Install files from the package:
atlas_install_joboptions( share/*.py )
diff --git a/Control/AthContainersInterfaces/CMakeLists.txt b/Control/AthContainersInterfaces/CMakeLists.txt
index 06cdc743d6aa166d0c45f15f165c83b9935adf1b..c743ac5c62a66c88d0f81f5acf035cbefef75860 100644
--- a/Control/AthContainersInterfaces/CMakeLists.txt
+++ b/Control/AthContainersInterfaces/CMakeLists.txt
@@ -1,33 +1,19 @@
-# $Id: CMakeLists.txt 781615 2016-11-01 16:20:50Z ssnyder $
-################################################################################
-# Package: AthContainersInterfaces
-################################################################################
+# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
# Declare the package name:
atlas_subdir( AthContainersInterfaces )
# Extra dependencies, based on the build environment:
if( NOT XAOD_STANDALONE )
- set( extra_deps Control/AthenaKernel )
set( extra_libs AthenaKernel )
endif()
-# Declare the package's dependencies:
-atlas_depends_on_subdirs(
- PUBLIC
- Control/CxxUtils
- ${extra_deps} )
-
-# External dependencies:
-find_package( Boost )
-
# Interface library for the package:
atlas_add_library( AthContainersInterfaces
AthContainersInterfaces/*.h AthContainersInterfaces/*.icc
INTERFACE
PUBLIC_HEADERS AthContainersInterfaces
- INCLUDE_DIRS ${Boost_INCLUDE_DIRS}
- LINK_LIBRARIES CxxUtils ${Boost_LIBRARIES} ${extra_libs} )
+ LINK_LIBRARIES CxxUtils ${extra_libs} )
# Test(s) in the package:
atlas_add_test( AuxStore_traits_test
diff --git a/Control/AthLinks/CMakeLists.txt b/Control/AthLinks/CMakeLists.txt
index 007227125646a80fc9b4097a49c642873cb281aa..3dded6a50af61a92773dd18203888003732d4c14 100644
--- a/Control/AthLinks/CMakeLists.txt
+++ b/Control/AthLinks/CMakeLists.txt
@@ -1,22 +1,11 @@
-################################################################################
-# Package: AthLinks
-################################################################################
+# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
# Declare the package name:
atlas_subdir( AthLinks )
-# Declare the package's dependencies:
-atlas_depends_on_subdirs( PUBLIC
- Control/AthenaKernel
- Control/CxxUtils
- Control/SGTools
- GaudiKernel
- PRIVATE
- AtlasTest/TestTools )
-
# External dependencies:
-find_package( Boost COMPONENTS filesystem thread system )
-find_package( ROOT COMPONENTS Core Tree MathCore Hist RIO pthread )
+find_package( Boost )
+find_package( ROOT COMPONENTS Core )
# Component(s) in the package:
atlas_add_library( AthLinks
@@ -25,106 +14,33 @@ atlas_add_library( AthLinks
INCLUDE_DIRS ${Boost_INCLUDE_DIRS}
PRIVATE_INCLUDE_DIRS ${ROOT_INCLUDE_DIRS}
LINK_LIBRARIES ${Boost_LIBRARIES} AthenaKernel CxxUtils SGTools GaudiKernel
- PRIVATE_LINK_LIBRARIES ${ROOT_LIBRARIES} TestTools )
+ PRIVATE_LINK_LIBRARIES ${ROOT_LIBRARIES} )
atlas_add_dictionary( AthLinksDict
AthLinks/AthLinksDict.h
AthLinks/selection.xml
- INCLUDE_DIRS ${Boost_INCLUDE_DIRS} ${ROOT_INCLUDE_DIRS}
- LINK_LIBRARIES ${Boost_LIBRARIES} ${ROOT_LIBRARIES} AthenaKernel CxxUtils SGTools GaudiKernel TestTools AthLinks )
-
-atlas_add_test( exceptions_test
- SOURCES
- test/exceptions_test.cxx
- INCLUDE_DIRS ${Boost_INCLUDE_DIRS} ${ROOT_INCLUDE_DIRS}
- LINK_LIBRARIES ${Boost_LIBRARIES} ${ROOT_LIBRARIES} AthenaKernel CxxUtils SGTools GaudiKernel TestTools AthLinks )
-
-atlas_add_test( DataProxyHolder_test
- SOURCES
- test/DataProxyHolder_test.cxx
- INCLUDE_DIRS ${Boost_INCLUDE_DIRS} ${ROOT_INCLUDE_DIRS}
- LINK_LIBRARIES ${Boost_LIBRARIES} ${ROOT_LIBRARIES} AthenaKernel CxxUtils SGTools GaudiKernel TestTools AthLinks )
-
-atlas_add_test( IndexHolder_test
- SOURCES
- test/IndexHolder_test.cxx
- INCLUDE_DIRS ${Boost_INCLUDE_DIRS} ${ROOT_INCLUDE_DIRS}
- LINK_LIBRARIES ${Boost_LIBRARIES} ${ROOT_LIBRARIES} AthenaKernel CxxUtils SGTools GaudiKernel TestTools AthLinks )
-
-atlas_add_test( IdentContIndex_test
- SOURCES
- test/IdentContIndex_test.cxx
- INCLUDE_DIRS ${Boost_INCLUDE_DIRS} ${ROOT_INCLUDE_DIRS}
- LINK_LIBRARIES ${Boost_LIBRARIES} ${ROOT_LIBRARIES} AthenaKernel CxxUtils SGTools GaudiKernel TestTools AthLinks )
-
-atlas_add_test( ForwardIndexingPolicy_test
- SOURCES
- test/ForwardIndexingPolicy_test.cxx
- INCLUDE_DIRS ${Boost_INCLUDE_DIRS} ${ROOT_INCLUDE_DIRS}
- LINK_LIBRARIES ${Boost_LIBRARIES} ${ROOT_LIBRARIES} AthenaKernel CxxUtils SGTools GaudiKernel TestTools AthLinks )
-
-atlas_add_test( SetIndexingPolicy_test
- SOURCES
- test/SetIndexingPolicy_test.cxx
- INCLUDE_DIRS ${Boost_INCLUDE_DIRS} ${ROOT_INCLUDE_DIRS}
- LINK_LIBRARIES ${Boost_LIBRARIES} ${ROOT_LIBRARIES} AthenaKernel CxxUtils SGTools GaudiKernel TestTools AthLinks )
-
-atlas_add_test( MapIndexingPolicy_test
- SOURCES
- test/MapIndexingPolicy_test.cxx
- INCLUDE_DIRS ${Boost_INCLUDE_DIRS} ${ROOT_INCLUDE_DIRS}
- LINK_LIBRARIES ${Boost_LIBRARIES} ${ROOT_LIBRARIES} AthenaKernel CxxUtils SGTools GaudiKernel TestTools AthLinks )
-
-atlas_add_test( IdentContIndexingPolicy_test
- SOURCES
- test/IdentContIndexingPolicy_test.cxx
- INCLUDE_DIRS ${Boost_INCLUDE_DIRS} ${ROOT_INCLUDE_DIRS}
- LINK_LIBRARIES ${Boost_LIBRARIES} ${ROOT_LIBRARIES} AthenaKernel CxxUtils SGTools GaudiKernel TestTools AthLinks )
-
-atlas_add_test( IsSTLSequence_test
- SOURCES
- test/IsSTLSequence_test.cxx
- INCLUDE_DIRS ${Boost_INCLUDE_DIRS} ${ROOT_INCLUDE_DIRS}
- LINK_LIBRARIES ${Boost_LIBRARIES} ${ROOT_LIBRARIES} AthenaKernel CxxUtils SGTools GaudiKernel TestTools AthLinks )
-
-atlas_add_test( DataLinkBase_test
- SOURCES
- test/DataLinkBase_test.cxx
- INCLUDE_DIRS ${Boost_INCLUDE_DIRS} ${ROOT_INCLUDE_DIRS}
- LINK_LIBRARIES ${Boost_LIBRARIES} ${ROOT_LIBRARIES} AthenaKernel CxxUtils SGTools GaudiKernel TestTools AthLinks )
-
-atlas_add_test( DataLink_test
- SOURCES
- test/DataLink_test.cxx
- INCLUDE_DIRS ${Boost_INCLUDE_DIRS} ${ROOT_INCLUDE_DIRS}
- LINK_LIBRARIES ${Boost_LIBRARIES} ${ROOT_LIBRARIES} AthenaKernel CxxUtils SGTools GaudiKernel TestTools AthLinks )
-
-atlas_add_test( ElementLinkBase_test
- SOURCES
- test/ElementLinkBase_test.cxx
- INCLUDE_DIRS ${Boost_INCLUDE_DIRS} ${ROOT_INCLUDE_DIRS}
- LINK_LIBRARIES ${Boost_LIBRARIES} ${ROOT_LIBRARIES} AthenaKernel CxxUtils SGTools GaudiKernel TestTools AthLinks )
-
-atlas_add_test( GenericElementLinkBase_test
- SOURCES
- test/GenericElementLinkBase_test.cxx
- INCLUDE_DIRS ${Boost_INCLUDE_DIRS} ${ROOT_INCLUDE_DIRS}
- LINK_LIBRARIES ${Boost_LIBRARIES} ${ROOT_LIBRARIES} AthenaKernel CxxUtils SGTools GaudiKernel TestTools AthLinks )
-
-atlas_add_test( ElementLink_test
- SOURCES
- test/ElementLink_test.cxx
- INCLUDE_DIRS ${Boost_INCLUDE_DIRS} ${ROOT_INCLUDE_DIRS}
- LINK_LIBRARIES ${Boost_LIBRARIES} ${ROOT_LIBRARIES} AthenaKernel CxxUtils SGTools GaudiKernel TestTools AthLinks )
-
-atlas_add_test( ElementLinkFwd_test
- SOURCES
- test/ElementLinkFwd_test.cxx
- INCLUDE_DIRS ${Boost_INCLUDE_DIRS} ${ROOT_INCLUDE_DIRS}
- LINK_LIBRARIES ${Boost_LIBRARIES} ${ROOT_LIBRARIES} AthenaKernel CxxUtils SGTools GaudiKernel TestTools AthLinks )
-
-atlas_add_test( AssociationMap_test
- SOURCES
- test/AssociationMap_test.cxx
- INCLUDE_DIRS ${Boost_INCLUDE_DIRS} ${ROOT_INCLUDE_DIRS}
- LINK_LIBRARIES ${Boost_LIBRARIES} ${ROOT_LIBRARIES} AthenaKernel CxxUtils SGTools GaudiKernel TestTools AthLinks )
+ LINK_LIBRARIES AthLinks )
+
+# Tests in the package:
+function( _add_test name )
+ atlas_add_test( ${name}
+ SOURCES test/${name}.cxx
+ LINK_LIBRARIES AthLinks TestTools )
+endfunction( _add_test )
+
+_add_test( exceptions_test )
+_add_test( DataProxyHolder_test )
+_add_test( IndexHolder_test )
+_add_test( IdentContIndex_test )
+_add_test( ForwardIndexingPolicy_test )
+_add_test( SetIndexingPolicy_test )
+_add_test( MapIndexingPolicy_test )
+_add_test( IdentContIndexingPolicy_test )
+_add_test( IsSTLSequence_test )
+_add_test( DataLinkBase_test )
+_add_test( DataLink_test )
+_add_test( ElementLinkBase_test )
+_add_test( GenericElementLinkBase_test )
+_add_test( ElementLink_test )
+_add_test( ElementLinkFwd_test )
+_add_test( AssociationMap_test )
diff --git a/Control/AthenaInterprocess/CMakeLists.txt b/Control/AthenaInterprocess/CMakeLists.txt
index 96bae6c96ce529ec3d3b30a62e0e2d6fbeef78ea..930a75e505307e456fbfdf08386a16bd1c3adc1e 100644
--- a/Control/AthenaInterprocess/CMakeLists.txt
+++ b/Control/AthenaInterprocess/CMakeLists.txt
@@ -1,15 +1,8 @@
-################################################################################
-# Package: AthenaInterprocess
-################################################################################
+# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
# Declare the package name:
atlas_subdir( AthenaInterprocess )
-# Declare the package's dependencies:
-atlas_depends_on_subdirs( PUBLIC
- Control/AthenaKernel
- GaudiKernel )
-
# External dependencies:
find_package( Boost )
find_package( UUID )
diff --git a/Control/AthenaMPTools/CMakeLists.txt b/Control/AthenaMPTools/CMakeLists.txt
index ce4f961be109d1dbe3bf5ee1d87e0fbfab9c35c3..dce52da4fede938f3f0c4328d959cdcfa90c4694 100644
--- a/Control/AthenaMPTools/CMakeLists.txt
+++ b/Control/AthenaMPTools/CMakeLists.txt
@@ -1,18 +1,8 @@
-################################################################################
-# Package: AthenaMPTools
-################################################################################
+# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
# Declare the package name:
atlas_subdir( AthenaMPTools )
-# Declare the package's dependencies:
-atlas_depends_on_subdirs( PUBLIC
- Control/AthenaInterprocess
- GaudiKernel
- PRIVATE
- Control/AthenaBaseComps
- Control/AthenaKernel )
-
# External dependencies:
find_package( Boost COMPONENTS filesystem thread system )
find_package( yampl )
diff --git a/Control/AthenaPython/CMakeLists.txt b/Control/AthenaPython/CMakeLists.txt
index 7f2e1eff24ad5e82f28ec3e192d6a32c7ec0a22a..222c1fc684cc30d272a99731ad1275b0dfa9617c 100644
--- a/Control/AthenaPython/CMakeLists.txt
+++ b/Control/AthenaPython/CMakeLists.txt
@@ -1,23 +1,11 @@
-################################################################################
-# Package: AthenaPython
-################################################################################
+# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
# Declare the package name:
atlas_subdir( AthenaPython )
-# Declare the package's dependencies:
-atlas_depends_on_subdirs( PUBLIC
- Control/AthenaBaseComps
- Control/AthenaKernel
- Control/StoreGate
- GaudiKernel
- PRIVATE
- Control/RootUtils
- Control/DataModelRoot )
-
# External dependencies:
find_package( Python COMPONENTS Development )
-find_package( ROOT COMPONENTS Core Tree MathCore Hist RIO pthread PyROOT )
+find_package( ROOT COMPONENTS Core PyROOT )
# Component(s) in the package:
atlas_add_library( AthenaPython
@@ -25,18 +13,16 @@ atlas_add_library( AthenaPython
PUBLIC_HEADERS AthenaPython
PRIVATE_INCLUDE_DIRS ${ROOT_INCLUDE_DIRS} ${Python_INCLUDE_DIRS}
LINK_LIBRARIES AthenaBaseComps AthenaKernel GaudiKernel
- PRIVATE_LINK_LIBRARIES ${ROOT_LIBRARIES} ${Python_LIBRARIES} CxxUtils DataModelRoot )
+ PRIVATE_LINK_LIBRARIES ${ROOT_LIBRARIES} ${Python_LIBRARIES} CxxUtils DataModelRoot RootUtils )
atlas_add_component( AthenaPythonComps
src/components/*.cxx
- INCLUDE_DIRS ${ROOT_INCLUDE_DIRS} ${Python_INCLUDE_DIRS}
LINK_LIBRARIES AthenaPython )
atlas_add_dictionary( AthenaPythonDict
AthenaPython/AthenaPythonDict.h
AthenaPython/selection.xml
- INCLUDE_DIRS ${ROOT_INCLUDE_DIRS} ${Python_INCLUDE_DIRS}
- LINK_LIBRARIES ${ROOT_LIBRARIES} ${Python_LIBRARIES} AthenaBaseComps AthenaKernel GaudiKernel CxxUtils DataModelRoot AthenaPython )
+ LINK_LIBRARIES AthenaPython )
# Install files from the package:
atlas_install_python_modules( python/*.py python/tests
diff --git a/Control/CoWTools/CMakeLists.txt b/Control/CoWTools/CMakeLists.txt
index e50e862715c6afbfe9e58c3c6bd62cfab23162d4..70b27fe1c5072d250180590d71171d73c3f7eba8 100644
--- a/Control/CoWTools/CMakeLists.txt
+++ b/Control/CoWTools/CMakeLists.txt
@@ -1,15 +1,8 @@
-# $Id: CMakeLists.txt 739580 2016-04-12 07:51:11Z krasznaa $
-################################################################################
-# Package: CoWTools
-################################################################################
+# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
# Declare the package name:
atlas_subdir( CoWTools )
-# Declare the package's dependencies:
-atlas_depends_on_subdirs( PUBLIC
- GaudiKernel )
-
# Component(s) in the package:
atlas_add_library( CoWTools
CoWTools/*.h src/*.cxx
diff --git a/Control/CxxUtils/CMakeLists.txt b/Control/CxxUtils/CMakeLists.txt
index 77a10b423aa03accc96a9ee1299acfcaa378845b..c585cbf5741a87da9a2041e5523aaffceb147df6 100644
--- a/Control/CxxUtils/CMakeLists.txt
+++ b/Control/CxxUtils/CMakeLists.txt
@@ -1,14 +1,8 @@
-################################################################################
-# Package: CxxUtils
-################################################################################
+# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
# Declare the package name:
atlas_subdir( CxxUtils )
-# Declare the package's dependencies:
-atlas_depends_on_subdirs(
- PRIVATE AtlasTest/TestTools )
-
# External dependencies:
find_package( Boost COMPONENTS program_options regex filesystem thread system timer unit_test_framework )
find_package( TBB )
@@ -123,7 +117,6 @@ endforeach()
# Needed because this executable directly uses multiversioned functions.
set_property( TARGET CxxUtils_crc64_test PROPERTY POSITION_INDEPENDENT_CODE ON )
-
# If we are in release rebuilding mode, stop here:
if( ATLAS_RELEASE_MODE )
return()
diff --git a/Control/Navigation/CMakeLists.txt b/Control/Navigation/CMakeLists.txt
index f20b96dc7912d2bc5c1d4412c17595c5d7c1446a..bf3331d55820d140adf5b84f046414df97349770 100644
--- a/Control/Navigation/CMakeLists.txt
+++ b/Control/Navigation/CMakeLists.txt
@@ -1,22 +1,8 @@
-################################################################################
-# Package: Navigation
-################################################################################
+# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
# Declare the package name:
atlas_subdir( Navigation )
-# Declare the package's dependencies:
-atlas_depends_on_subdirs(
- PUBLIC
- Control/AthAllocators
- Control/AthLinks
- Control/AthenaKernel
- PRIVATE
- Control/AthContainers
- AtlasTest/TestTools
- Control/StoreGate
- GaudiKernel )
-
# External dependencies:
find_package( Boost )
find_package( UUID )
@@ -27,7 +13,7 @@ atlas_add_library( Navigation Navigation/*.h Navigation/*.icc src/*.cxx
INCLUDE_DIRS ${Boost_INCLUDE_DIRS}
PRIVATE_INCLUDE_DIRS ${UUID_INCLUDE_DIRS}
LINK_LIBRARIES ${Boost_LIBRARIES} AthAllocators AthLinks AthenaKernel
- PRIVATE_LINK_LIBRARIES ${UUID_LIBRARIES} )
+ PRIVATE_LINK_LIBRARIES ${UUID_LIBRARIES} GaudiKernel )
atlas_add_dictionary( NavigationDict
Navigation/NavigationDict.h Navigation/selection.xml
@@ -40,13 +26,10 @@ atlas_add_test( NavigationToken_test
atlas_add_test( NavigableIterator_test
SOURCES test/NavigableIterator_test.cxx
- INCLUDE_DIRS ${Boost_INCLUDE_DIRS}
- LINK_LIBRARIES ${Boost_LIBRARIES} AthContainers TestTools
- StoreGateLib GaudiKernel Navigation
+ LINK_LIBRARIES AthContainers TestTools StoreGateLib GaudiKernel Navigation
ENVIRONMENT "JOBOPTSEARCHPATH=${CMAKE_CURRENT_SOURCE_DIR}/share" )
atlas_add_test( AthenaBarCodeImpl_test
SOURCES test/AthenaBarCodeImpl_test.cxx
- INCLUDE_DIRS ${Boost_INCLUDE_DIRS}
- LINK_LIBRARIES ${Boost_LIBRARIES} Navigation
+ LINK_LIBRARIES Navigation
POST_EXEC_SCRIPT nopost.sh )
diff --git a/Control/RootUtils/CMakeLists.txt b/Control/RootUtils/CMakeLists.txt
index 9f5008148faf6e7f85efc25f8adc34cb27619459..806b64cd0aa65d39050b06602f64f6f132a7e568 100644
--- a/Control/RootUtils/CMakeLists.txt
+++ b/Control/RootUtils/CMakeLists.txt
@@ -1,16 +1,8 @@
-################################################################################
-# Package: RootUtils
-################################################################################
+# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
# Declare the package name:
atlas_subdir( RootUtils )
-# Declare the package's dependencies:
-atlas_depends_on_subdirs( PUBLIC
- Control/CxxUtils
- PRIVATE
- AtlasTest/TestTools )
-
# External dependencies:
find_package( Boost COMPONENTS filesystem thread system )
find_package( Python COMPONENTS Development )
@@ -42,7 +34,6 @@ atlas_add_library( RootUtilsPyROOT
LINK_LIBRARIES ${Python_LIBRARIES} ${Boost_LIBRARIES} RootUtils
PRIVATE_LINK_LIBRARIES ${ROOT_LIBRARIES} TestTools )
-
atlas_add_dictionary( RootUtilsPyROOTDict
RootUtils/RootUtilsPyROOTDict.h
RootUtils/selection_PyROOT.xml
diff --git a/Control/xAODDataSource/CMakeLists.txt b/Control/xAODDataSource/CMakeLists.txt
index eaa136f2594073e31f621703da24b7ab096caea3..cb80de808345da0b5844a56a42762b941f8d79b3 100644
--- a/Control/xAODDataSource/CMakeLists.txt
+++ b/Control/xAODDataSource/CMakeLists.txt
@@ -3,13 +3,6 @@
# Set the name of the package.
atlas_subdir( xAODDataSource )
-# Set its dependencies on other packages.
-atlas_depends_on_subdirs(
- PUBLIC
- Control/CxxUtils
- Control/RootUtils
- Control/xAODRootAccess )
-
# External dependencies. VDT is necessary because the DataFrame code has
# a public dependency on it.
find_package( ROOT COMPONENTS Core Tree TreePlayer RIO ROOTDataFrame )
diff --git a/PhysicsAnalysis/ElectronPhotonID/ElectronEfficiencyCorrection/CMakeLists.txt b/PhysicsAnalysis/ElectronPhotonID/ElectronEfficiencyCorrection/CMakeLists.txt
index 214581144d989e86d781f60869afe46615d339a8..6cb851b4288c7b597cc65b6de33a716307d2672f 100644
--- a/PhysicsAnalysis/ElectronPhotonID/ElectronEfficiencyCorrection/CMakeLists.txt
+++ b/PhysicsAnalysis/ElectronPhotonID/ElectronEfficiencyCorrection/CMakeLists.txt
@@ -1,39 +1,8 @@
-################################################################################
-# Package: ElectronEfficiencyCorrection
-################################################################################
+# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
# Declare the package name:
atlas_subdir( ElectronEfficiencyCorrection )
-# Extra dependencies when not in AnalysisBase:
-set( extra_deps )
-if( NOT XAOD_STANDALONE )
- set( extra_deps Control/AthenaBaseComps GaudiKernel )
-else()
- set( extra_deps Control/xAODRootAccess )
-endif()
-
-# Declare the package's dependencies:
-atlas_depends_on_subdirs(
- PUBLIC
- Control/AthContainers
- Control/AthToolSupport/AsgTools
- Event/xAOD/xAODEgamma
- PhysicsAnalysis/AnalysisCommon/PATCore
- PhysicsAnalysis/AnalysisCommon/PATInterfaces
- PhysicsAnalysis/Interfaces/AsgAnalysisInterfaces
- PhysicsAnalysis/Interfaces/EgammaAnalysisInterfaces
- PRIVATE
- Control/AthAnalysisBaseComps
- Tools/PathResolver
- Control/CxxUtils
- Event/xAOD/xAODCaloEvent
- Event/xAOD/xAODCore
- Event/xAOD/xAODEventInfo
- Event/xAOD/xAODTracking
- Event/xAOD/xAODMetaData
- ${extra_deps} )
-
# External dependencies:
find_package( Boost )
find_package( ROOT COMPONENTS Core Hist MathCore)
@@ -45,7 +14,7 @@ atlas_add_library( ElectronEfficiencyCorrectionLib
INCLUDE_DIRS ${Boost_INCLUDE_DIRS} ${ROOT_INCLUDE_DIRS}
LINK_LIBRARIES ${Boost_LIBRARIES} ${ROOT_LIBRARIES} AthContainers AsgTools
xAODEgamma PATInterfaces PATCoreLib AsgAnalysisInterfaces EgammaAnalysisInterfacesLib
- PRIVATE_LINK_LIBRARIES xAODCaloEvent xAODCore xAODEventInfo xAODTracking
+ PRIVATE_LINK_LIBRARIES AthAnalysisBaseCompsLib xAODCaloEvent xAODCore xAODEventInfo xAODTracking
xAODMetaData PathResolver )
if( NOT XAOD_STANDALONE )