diff --git a/Database/AthenaPOOL/AthenaPoolCnvSvc/CMakeLists.txt b/Database/AthenaPOOL/AthenaPoolCnvSvc/CMakeLists.txt
index e440c25e8197c44677aa1aa2234486312502c0f3..8c29c9128235b0d8bc863357aa096408d247236f 100644
--- a/Database/AthenaPOOL/AthenaPoolCnvSvc/CMakeLists.txt
+++ b/Database/AthenaPOOL/AthenaPoolCnvSvc/CMakeLists.txt
@@ -1,34 +1,8 @@
-# $Id: CMakeLists.txt 790790 2016-12-21 22:31:42Z gemmeren $
-################################################################################
-# Package: AthenaPoolCnvSvc
-################################################################################
+# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
# Declare the package name:
atlas_subdir( AthenaPoolCnvSvc )
-# Declare the package's dependencies:
-atlas_depends_on_subdirs(
- PUBLIC
- Control/AthContainers
- Control/AthLinks
- Control/AthenaBaseComps
- Control/AthenaKernel
- Control/CxxUtils
- Control/DataModelRoot
- Control/SGTools
- Database/APR/StorageSvc
- Database/AthenaPOOL/AthenaPoolUtilities
- Database/AthenaPOOL/PoolSvc
- Database/PersistentDataModel
- Database/TPTools
- GaudiKernel
- PRIVATE
- AtlasTest/TestTools
- Control/AthContainersInterfaces
- Control/AthContainersRoot
- Control/RootUtils
- Control/StoreGate )
-
# External dependencies:
find_package( Boost )
find_package( ROOT COMPONENTS Core )
@@ -39,10 +13,8 @@ atlas_add_library( AthenaPoolCnvSvcLib
PUBLIC_HEADERS AthenaPoolCnvSvc
INCLUDE_DIRS ${Boost_INCLUDE_DIRS}
PRIVATE_INCLUDE_DIRS ${ROOT_INCLUDE_DIRS}
- LINK_LIBRARIES ${Boost_LIBRARIES} AthContainers AthContainersRoot AthLinks AthenaBaseComps PoolSvcLib
- AthenaKernel CxxUtils DataModelRoot RootUtils SGTools StorageSvc AthenaPoolUtilities
- PersistentDataModel TPTools GaudiKernel StoreGateLib
- PRIVATE_LINK_LIBRARIES ${ROOT_LIBRARIES} )
+ LINK_LIBRARIES ${Boost_LIBRARIES} AthContainers AthLinks AthenaBaseComps AthenaKernel AthenaPoolUtilities CxxUtils DataModelRoot GaudiKernel PersistentDataModel PoolSvcLib StorageSvc TPTools
+ PRIVATE_LINK_LIBRARIES ${ROOT_LIBRARIES} AthContainersInterfaces AthContainersRoot RootUtils SGTools StoreGateLib )
atlas_add_component( AthenaPoolCnvSvc
src/components/*.cxx
@@ -62,51 +34,46 @@ atlas_add_test( exceptions_test
atlas_add_test( TPCnvElt_test
SOURCES test/TPCnvElt_test.cxx
INCLUDE_DIRS ${ROOT_INCLUDE_DIRS}
- LINK_LIBRARIES ${ROOT_LIBRARIES} GaudiKernel AthenaPoolCnvSvcLib )
+ LINK_LIBRARIES ${ROOT_LIBRARIES} AthenaPoolCnvSvcLib )
atlas_add_test( TPCnvList_test
SOURCES test/TPCnvList_test.cxx
INCLUDE_DIRS ${ROOT_INCLUDE_DIRS}
- LINK_LIBRARIES ${ROOT_LIBRARIES} GaudiKernel AthenaPoolCnvSvcLib )
+ LINK_LIBRARIES ${ROOT_LIBRARIES} AthenaPoolCnvSvcLib )
atlas_add_test( T_AthenaPoolCreateFuncs_test
SOURCES test/T_AthenaPoolCreateFuncs_test.cxx
INCLUDE_DIRS ${ROOT_INCLUDE_DIRS}
- LINK_LIBRARIES ${ROOT_LIBRARIES} GaudiKernel AthenaPoolCnvSvcLib )
+ LINK_LIBRARIES ${ROOT_LIBRARIES} AthenaPoolCnvSvcLib )
atlas_add_test( T_AthenaPoolViewVectorCnv_test
SOURCES test/T_AthenaPoolViewVectorCnv_test.cxx
INCLUDE_DIRS ${ROOT_INCLUDE_DIRS}
- LINK_LIBRARIES ${ROOT_LIBRARIES} AthContainers AthLinks SGTools GaudiKernel
- TestTools AthenaPoolCnvSvcLib
+ LINK_LIBRARIES ${ROOT_LIBRARIES} AthenaPoolCnvSvcLib TestTools
ENVIRONMENT "JOBOPTSEARCHPATH=${CMAKE_CURRENT_SOURCE_DIR}/share" )
atlas_add_test( T_AthenaPoolxAODCnv_test
SOURCES test/T_AthenaPoolxAODCnv_test.cxx
INCLUDE_DIRS ${ROOT_INCLUDE_DIRS}
- LINK_LIBRARIES ${ROOT_LIBRARIES} PersistentDataModel SGTools TestTools
- CxxUtils AthenaPoolCnvSvcLib
+ LINK_LIBRARIES ${ROOT_LIBRARIES} AthenaPoolCnvSvcLib TestTools
ENVIRONMENT "JOBOPTSEARCHPATH=${CMAKE_CURRENT_SOURCE_DIR}/share" )
atlas_add_test( T_AthenaPoolAuxContainerCnv_test
SOURCES test/T_AthenaPoolAuxContainerCnv_test.cxx
INCLUDE_DIRS ${ROOT_INCLUDE_DIRS}
- LINK_LIBRARIES ${ROOT_LIBRARIES} PersistentDataModel AthContainers SGTools
- TestTools CxxUtils AthenaPoolCnvSvcLib
+ LINK_LIBRARIES ${ROOT_LIBRARIES} AthenaPoolCnvSvcLib TestTools
ENVIRONMENT "JOBOPTSEARCHPATH=${CMAKE_CURRENT_SOURCE_DIR}/share" )
atlas_add_test( T_AthenaPoolTPCnvCnv_test
SOURCES test/T_AthenaPoolTPCnvCnv_test.cxx
INCLUDE_DIRS ${ROOT_INCLUDE_DIRS}
- LINK_LIBRARIES ${ROOT_LIBRARIES} PersistentDataModel SGTools TestTools
- CxxUtils AthenaPoolCnvSvcLib
+ LINK_LIBRARIES ${ROOT_LIBRARIES} AthenaPoolCnvSvcLib TestTools
ENVIRONMENT "JOBOPTSEARCHPATH=${CMAKE_CURRENT_SOURCE_DIR}/share" )
atlas_add_test( T_AuxContainerCopyTPCnv_test
SOURCES test/T_AuxContainerCopyTPCnv_test.cxx
INCLUDE_DIRS ${ROOT_INCLUDE_DIRS}
- LINK_LIBRARIES ${ROOT_LIBRARIES} PersistentDataModel SGTools TestTools
- CxxUtils AthenaPoolCnvSvcLib )
+ LINK_LIBRARIES ${ROOT_LIBRARIES} AthenaPoolCnvSvcLib TestTools )
# Install files from the package:
atlas_install_python_modules( python/*.py )
diff --git a/Database/AthenaPOOL/AthenaPoolExample/AthenaPoolExampleAlgorithms/CMakeLists.txt b/Database/AthenaPOOL/AthenaPoolExample/AthenaPoolExampleAlgorithms/CMakeLists.txt
index 9732a2e3d7e6cb1c324709d2c22c634da91cd508..94d2d0cb78be81c5ed30aa2ba357cfac8757014f 100644
--- a/Database/AthenaPOOL/AthenaPoolExample/AthenaPoolExampleAlgorithms/CMakeLists.txt
+++ b/Database/AthenaPOOL/AthenaPoolExample/AthenaPoolExampleAlgorithms/CMakeLists.txt
@@ -1,29 +1,13 @@
-################################################################################
-# Package: AthenaPoolExampleAlgorithms
-################################################################################
+# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
# Declare the package name:
atlas_subdir( AthenaPoolExampleAlgorithms )
-# Declare the package's dependencies:
-atlas_depends_on_subdirs( PRIVATE
- AtlasTest/TestTools
- Control/AthenaBaseComps
- Control/AthenaKernel
- Control/StoreGate
- Database/AthenaPOOL/AthenaPoolExample/AthenaPoolExampleData
- Database/AthenaPOOL/AthenaPoolUtilities
- Database/AthenaPOOL/DBDataModel
- Event/ByteStreamData
- Event/EventBookkeeperMetaData
- Event/EventInfo
- GaudiKernel )
-
# Component(s) in the package:
atlas_add_component( AthenaPoolExampleAlgorithms
src/*.cxx
src/components/*.cxx
- LINK_LIBRARIES AthenaBaseComps AthenaKernel StoreGateLib SGtests AthenaPoolExampleData AthenaPoolUtilities DBDataModel ByteStreamData ByteStreamData_test EventBookkeeperMetaData EventInfo GaudiKernel )
+ LINK_LIBRARIES AthenaBaseComps AthenaKernel AthenaPoolExampleData AthenaPoolUtilities EventBookkeeperMetaData EventInfo GaudiKernel PersistentDataModel StoreGateLib )
# Install files from the package:
atlas_install_joboptions( share/*.py )
diff --git a/Database/AthenaPOOL/AthenaPoolExample/AthenaPoolExampleConverter/CMakeLists.txt b/Database/AthenaPOOL/AthenaPoolExample/AthenaPoolExampleConverter/CMakeLists.txt
index e865fbf286c1b1462181767b22fecec84adde359..3d8acdcb27005a6b90e14ed16acc1c1765145ad1 100644
--- a/Database/AthenaPOOL/AthenaPoolExample/AthenaPoolExampleConverter/CMakeLists.txt
+++ b/Database/AthenaPOOL/AthenaPoolExample/AthenaPoolExampleConverter/CMakeLists.txt
@@ -1,43 +1,28 @@
-################################################################################
-# Package: AthenaPoolExampleConverter
-################################################################################
+# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
# Declare the package name:
atlas_subdir( AthenaPoolExampleConverter )
-# Declare the package's dependencies:
-atlas_depends_on_subdirs( PUBLIC
- Control/DataModelAthenaPool
- Control/CxxUtils
- Database/AthenaPOOL/AthenaPoolExample/AthenaPoolExampleData
- Database/AthenaPOOL/AthenaPoolServices
- Database/AthenaPOOL/AthenaPoolUtilities
- PRIVATE
- Database/AthenaPOOL/AthenaPoolCnvSvc )
-
# External dependencies:
find_package( CLHEP )
-find_package( ROOT COMPONENTS Core Tree MathCore Hist RIO pthread )
# Component(s) in the package:
atlas_add_library( AthenaPoolExampleConverter
src/*.cxx
PUBLIC_HEADERS AthenaPoolExampleConverter
- INCLUDE_DIRS ${ROOT_INCLUDE_DIRS} ${CLHEP_INCLUDE_DIRS}
+ INCLUDE_DIRS ${CLHEP_INCLUDE_DIRS}
DEFINITIONS ${CLHEP_DEFINITIONS}
- LINK_LIBRARIES ${ROOT_LIBRARIES} ${CLHEP_LIBRARIES} AthenaPoolExampleData AthenaPoolUtilities DataModelAthenaPoolLib AthenaPoolCnvSvcLib AthenaPoolServicesLib )
+ LINK_LIBRARIES ${CLHEP_LIBRARIES} AthenaPoolExampleData AthenaPoolServicesLib CxxUtils DataModelAthenaPoolLib
+ PRIVATE_LINK_LIBRARIES AthenaPoolCnvSvcLib )
atlas_add_poolcnv_library( AthenaPoolExampleConverterPoolCnv
FILES AthenaPoolExampleData/ExampleHitContainer.h AthenaPoolExampleData/ExampleTrackContainer.h
- INCLUDE_DIRS ${ROOT_INCLUDE_DIRS} ${CLHEP_INCLUDE_DIRS}
- LINK_LIBRARIES ${ROOT_LIBRARIES} ${CLHEP_LIBRARIES} DataModelAthenaPoolLib AthenaPoolExampleData AthenaPoolUtilities AthenaPoolCnvSvcLib AthenaPoolExampleConverter )
+ LINK_LIBRARIES AthenaPoolExampleConverter )
atlas_add_dictionary( AthenaPoolExampleConverterDict
AthenaPoolExampleConverter/AthenaPoolExampleConverterDict.h
AthenaPoolExampleConverter/selection.xml
- INCLUDE_DIRS ${ROOT_INCLUDE_DIRS} ${CLHEP_INCLUDE_DIRS}
- LINK_LIBRARIES ${ROOT_LIBRARIES} ${CLHEP_LIBRARIES} DataModelAthenaPoolLib AthenaPoolExampleData AthenaPoolUtilities AthenaPoolCnvSvcLib AthenaPoolExampleConverter )
+ LINK_LIBRARIES AthenaPoolExampleConverter )
# Install files from the package:
atlas_install_joboptions( share/*.py )
-
diff --git a/Database/AthenaPOOL/AthenaPoolExample/AthenaPoolExampleData/CMakeLists.txt b/Database/AthenaPOOL/AthenaPoolExample/AthenaPoolExampleData/CMakeLists.txt
index 93920abb38001b5a13324fe5ea0035e428915666..6772cac81950de7eb4fe729d5e389a1c9cba6430 100644
--- a/Database/AthenaPOOL/AthenaPoolExample/AthenaPoolExampleData/CMakeLists.txt
+++ b/Database/AthenaPOOL/AthenaPoolExample/AthenaPoolExampleData/CMakeLists.txt
@@ -1,36 +1,22 @@
-################################################################################
-# Package: AthenaPoolExampleData
-################################################################################
+# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
# Declare the package name:
atlas_subdir( AthenaPoolExampleData )
-# Declare the package's dependencies:
-atlas_depends_on_subdirs( PUBLIC
- Control/AthContainers
- Control/AthLinks
- Control/AthenaKernel
- Control/Navigation
- GaudiKernel )
-
# External dependencies:
find_package( CLHEP )
-find_package( ROOT COMPONENTS Core Tree MathCore Hist RIO pthread )
# Component(s) in the package:
atlas_add_library( AthenaPoolExampleData
src/*.cxx
PUBLIC_HEADERS AthenaPoolExampleData
INCLUDE_DIRS ${CLHEP_INCLUDE_DIRS}
- PRIVATE_INCLUDE_DIRS ${ROOT_INCLUDE_DIRS}
DEFINITIONS ${CLHEP_DEFINITIONS}
- LINK_LIBRARIES ${CLHEP_LIBRARIES} AthContainers AthLinks Navigation GaudiKernel
- PRIVATE_LINK_LIBRARIES ${ROOT_LIBRARIES} )
+ LINK_LIBRARIES ${CLHEP_LIBRARIES} AthContainers AthLinks AthenaKernel GaudiKernel Navigation )
atlas_add_dictionary( AthenaPoolExampleDataDict
AthenaPoolExampleData/AthenaPoolExampleDataDict.h
AthenaPoolExampleData/selection.xml
- INCLUDE_DIRS ${ROOT_INCLUDE_DIRS} ${CLHEP_INCLUDE_DIRS}
- LINK_LIBRARIES ${ROOT_LIBRARIES} ${CLHEP_LIBRARIES} AthContainers AthLinks Navigation GaudiKernel AthenaPoolExampleData
+ LINK_LIBRARIES AthenaPoolExampleData
NAVIGABLES ExampleHitContainer )
diff --git a/Database/AthenaPOOL/AthenaPoolServices/CMakeLists.txt b/Database/AthenaPOOL/AthenaPoolServices/CMakeLists.txt
index b7676b0ed8d26b21ec2071059b05d18e2e8cbd16..6d9c789154d44351f76f1f3ef875a591dbdd7abc 100644
--- a/Database/AthenaPOOL/AthenaPoolServices/CMakeLists.txt
+++ b/Database/AthenaPOOL/AthenaPoolServices/CMakeLists.txt
@@ -3,14 +3,6 @@
# Declare the package name:
atlas_subdir( AthenaPoolServices )
-# Declare the package's dependencies:
-atlas_depends_on_subdirs( PUBLIC
- GaudiKernel
- PRIVATE
- Control/AthenaBaseComps
- Control/DataModelRoot
- Database/APR/StorageSvc )
-
# External dependencies:
find_package( ROOT COMPONENTS Core )
@@ -24,8 +16,7 @@ atlas_add_library( AthenaPoolServicesLib
atlas_add_component( AthenaRootStreamerSvc
src/*.h src/*.cxx src/components/*.cxx
INCLUDE_DIRS ${ROOT_INCLUDE_DIRS}
- LINK_LIBRARIES ${ROOT_LIBRARIES} GaudiKernel AthenaBaseComps DataModelRoot
- StorageSvc )
+ LINK_LIBRARIES ${ROOT_LIBRARIES} AthenaBaseComps AthenaPoolServicesLib DataModelRoot StorageSvc )
# Install files from the package:
atlas_install_joboptions( share/*.py )
diff --git a/Database/AthenaPOOL/AthenaPoolTools/CMakeLists.txt b/Database/AthenaPOOL/AthenaPoolTools/CMakeLists.txt
index 1ebe4fe84f871bad095ad555e71ac8d4a39cf606..5c48780c238016fb0c838e6926f7fffd0519ff8c 100644
--- a/Database/AthenaPOOL/AthenaPoolTools/CMakeLists.txt
+++ b/Database/AthenaPOOL/AthenaPoolTools/CMakeLists.txt
@@ -1,29 +1,15 @@
-################################################################################
-# Package: AthenaPoolTools
-################################################################################
+# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
# Declare the package name:
atlas_subdir( AthenaPoolTools )
-# Declare the package's dependencies:
-atlas_depends_on_subdirs( PRIVATE
- Control/AthenaBaseComps
- Control/AthenaKernel
- Control/StoreGate
- Database/PersistentDataModel
- Event/EventInfo
- Event/ByteStreamData
- Event/xAOD/xAODEventInfo
- Event/xAOD/xAODCutFlow
- GaudiKernel )
-
# Component(s) in the package:
atlas_add_component( AthenaPoolTools
src/EventCount.cxx
src/MetadataTest.cxx
src/RequireUniqueEvent.cxx
src/components/*.cxx
- LINK_LIBRARIES AthenaBaseComps AthenaKernel StoreGateLib SGtests PersistentDataModel EventInfo xAODEventInfo GaudiKernel xAODCutFlow ByteStreamData)
+ LINK_LIBRARIES AthenaBaseComps AthenaKernel ByteStreamData EventInfo GaudiKernel PersistentDataModel StoreGateLib xAODCutFlow xAODEventInfo )
# Install files from the package:
atlas_install_joboptions( share/*.py )
diff --git a/Database/AthenaPOOL/AthenaPoolUtilities/CMakeLists.txt b/Database/AthenaPOOL/AthenaPoolUtilities/CMakeLists.txt
index 6198f0c0eff148bc70cf807f5e8aba60c1651d1d..486494d4560b4b155fbab272ab48950b0bed8d14 100644
--- a/Database/AthenaPOOL/AthenaPoolUtilities/CMakeLists.txt
+++ b/Database/AthenaPOOL/AthenaPoolUtilities/CMakeLists.txt
@@ -1,20 +1,8 @@
-# $Id: CMakeLists.txt 758198 2016-06-28 15:18:49Z mnowak $
-################################################################################
-# Package: AthenaPoolUtilities
-################################################################################
+# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
# Declare the package name:
atlas_subdir( AthenaPoolUtilities )
-# Declare the package's dependencies:
-atlas_depends_on_subdirs(
- PUBLIC
- Control/AthenaKernel
- Control/AthContainers
- Control/CxxUtils
- Database/AthenaPOOL/DBDataModel
- Database/PersistentDataModel )
-
# External dependencies:
find_package( CORAL COMPONENTS CoralBase CoralKernel RelationalAccess )
@@ -24,8 +12,7 @@ atlas_add_library( AthenaPoolUtilities
INTERFACE
PUBLIC_HEADERS AthenaPoolUtilities
INCLUDE_DIRS ${CORAL_INCLUDE_DIRS}
- LINK_LIBRARIES ${CORAL_LIBRARIES} AthenaKernel AthContainers DBDataModel
- PersistentDataModel )
+ LINK_LIBRARIES ${CORAL_LIBRARIES} AthContainers AthenaKernel CollectionBase CxxUtils DBDataModel GaudiKernel PersistentDataModel )
atlas_add_dictionary( AthenaPoolUtilitiesCoralDict
AthenaPoolUtilities/AthenaPoolUtilitiesCoralDict.h
diff --git a/Database/AthenaPOOL/AtlasCollectionTools/CMakeLists.txt b/Database/AthenaPOOL/AtlasCollectionTools/CMakeLists.txt
index b4d9a4c596c67b716595f935b0f25b48c3887707..6b8c0e83c4095bd73c7af5e9be6a9aa48675b5e4 100644
--- a/Database/AthenaPOOL/AtlasCollectionTools/CMakeLists.txt
+++ b/Database/AthenaPOOL/AtlasCollectionTools/CMakeLists.txt
@@ -1,18 +1,8 @@
-################################################################################
-# Package: AtlasCollectionTools
-################################################################################
+# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
# Declare the package name:
atlas_subdir( AtlasCollectionTools )
-# Declare the package's dependencies:
-atlas_depends_on_subdirs( PRIVATE
- DataQuality/GoodRunsLists
- Database/APR/CollectionBase
- Database/APR/CollectionUtilities
- Database/APR/PersistencySvc
- Database/APR/StorageSvc )
-
# Necessary external(s):
find_package( cx_Oracle )
@@ -22,13 +12,11 @@ atlas_add_library( AtlasCollectionTools
src/GlobalUniqueKey.cxx
src/GlobalSum.cxx
NO_PUBLIC_HEADERS
- LINK_LIBRARIES GoodRunsListsLib
- PRIVATE_LINK_LIBRARIES CollectionBase CollectionUtilities PersistencySvc StorageSvc )
+ PRIVATE_LINK_LIBRARIES CollectionUtilities GoodRunsListsLib )
atlas_add_executable( AthCollAppend
src/CollAppend.cxx
- LINK_LIBRARIES GoodRunsListsLib CollectionBase CollectionUtilities PersistencySvc StorageSvc AtlasCollectionTools )
-
+ LINK_LIBRARIES AtlasCollectionTools CollectionUtilities )
# Install files from the package:
atlas_install_python_modules( python/countGuidsClient.py python/eventLookupClient.py )
diff --git a/Database/AthenaPOOL/DBDataModel/CMakeLists.txt b/Database/AthenaPOOL/DBDataModel/CMakeLists.txt
index 3507c4fdf71549eab5b409cc235fd7689fcf3db6..a10f54962068eae826c42f82246c5ea48ea13e83 100644
--- a/Database/AthenaPOOL/DBDataModel/CMakeLists.txt
+++ b/Database/AthenaPOOL/DBDataModel/CMakeLists.txt
@@ -1,31 +1,16 @@
-################################################################################
-# Package: DBDataModel
-################################################################################
+# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
# Declare the package name:
atlas_subdir( DBDataModel )
-# Declare the package's dependencies:
-atlas_depends_on_subdirs( PUBLIC
- Control/AthenaKernel
- Control/AthContainers
- PRIVATE
- Database/APR/CollectionBase )
-
-# External dependencies:
-find_package( ROOT COMPONENTS Core Tree MathCore Hist RIO pthread )
-
# Component(s) in the package:
atlas_add_library( DBDataModel
src/*.cxx
PUBLIC_HEADERS DBDataModel
- PRIVATE_INCLUDE_DIRS ${ROOT_INCLUDE_DIRS}
- LINK_LIBRARIES AthContainers
- PRIVATE_LINK_LIBRARIES ${ROOT_LIBRARIES} CollectionBase )
+ LINK_LIBRARIES AthContainers AthenaKernel
+ PRIVATE_LINK_LIBRARIES CollectionBase )
atlas_add_dictionary( DBDataModelDict
DBDataModel/DBDataModelDict.h
DBDataModel/selection.xml
- INCLUDE_DIRS ${ROOT_INCLUDE_DIRS}
- LINK_LIBRARIES ${ROOT_LIBRARIES} AthContainers CollectionBase DBDataModel )
-
+ LINK_LIBRARIES DBDataModel )
diff --git a/Database/AthenaPOOL/EventSelectorAthenaPool/CMakeLists.txt b/Database/AthenaPOOL/EventSelectorAthenaPool/CMakeLists.txt
index 5d9257e6ba333731796b3039042c1d9cb026f21a..f903efc01ea050571f2449a949d34311f669fe3a 100644
--- a/Database/AthenaPOOL/EventSelectorAthenaPool/CMakeLists.txt
+++ b/Database/AthenaPOOL/EventSelectorAthenaPool/CMakeLists.txt
@@ -1,27 +1,10 @@
-################################################################################
-# Package: EventSelectorAthenaPool
-################################################################################
+# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
# Declare the package name:
atlas_subdir( EventSelectorAthenaPool )
-# Declare the package's dependencies:
-atlas_depends_on_subdirs(
- PUBLIC
- PRIVATE
- Control/AthenaBaseComps
- Control/AthenaKernel
- Control/StoreGate
- Database/APR/CollectionBase
- Database/APR/PersistencySvc
- Database/AthenaPOOL/AthenaPoolCnvSvc
- Database/AthenaPOOL/AthenaPoolUtilities
- Database/AthenaPOOL/PoolSvc
- Database/PersistentDataModel
- GaudiKernel )
-
# External dependencies:
-find_package( CORAL COMPONENTS CoralBase CoralKernel RelationalAccess )
+find_package( CORAL COMPONENTS CoralBase )
# Component(s) in the package:
atlas_add_component( EventSelectorAthenaPool
@@ -32,14 +15,13 @@ atlas_add_component( EventSelectorAthenaPool
src/PoolCollectionConverter.cxx
src/registerKeys.cxx
src/components/*.cxx
- INCLUDE_DIRS ${CORAL_INCLUDE_DIRS}
- LINK_LIBRARIES ${CORAL_LIBRARIES} AthenaBaseComps AthenaKernel StoreGateLib SGtests CollectionBase PersistencySvc AthenaPoolCnvSvcLib AthenaPoolUtilities PersistentDataModel GaudiKernel )
+ INCLUDE_DIRS ${CORAL_INCLUDE_DIRS}
+ LINK_LIBRARIES ${CORAL_LIBRARIES} AthenaBaseComps AthenaKernel AthenaPoolCnvSvcLib AthenaPoolUtilities CollectionBase GaudiKernel PersistencySvc PersistentDataModel PoolSvcLib StoreGateLib )
# Install files from the package:
-atlas_install_python_modules( python/*.py )
+atlas_install_python_modules( python/*.py POST_BUILD_CMD ${ATLAS_FLAKE8} )
atlas_install_joboptions( share/*.py )
-
atlas_add_test( CondProxyProviderConfig_test
SCRIPT python -m EventSelectorAthenaPool.CondProxyProviderConfig
LOG_SELECT_PATTERN "ComponentAccumulator|^---|^CondProxyProvider" )
diff --git a/Database/AthenaPOOL/OutputStreamAthenaPool/CMakeLists.txt b/Database/AthenaPOOL/OutputStreamAthenaPool/CMakeLists.txt
index 3c260a8619c927f7f3371bc7a8b5af11a15b734c..3f4529a4a7c98344c04e3c467b570c50cf48601e 100644
--- a/Database/AthenaPOOL/OutputStreamAthenaPool/CMakeLists.txt
+++ b/Database/AthenaPOOL/OutputStreamAthenaPool/CMakeLists.txt
@@ -1,24 +1,8 @@
-################################################################################
-# Package: OutputStreamAthenaPool
-################################################################################
+# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
# Declare the package name:
atlas_subdir( OutputStreamAthenaPool )
-# Declare the package's dependencies:
-atlas_depends_on_subdirs( PRIVATE
- Control/AthenaBaseComps
- Control/AthenaKernel
- Control/SGTools
- Control/StoreGate
- Database/AthenaPOOL/AthenaPoolCnvSvc
- Database/AthenaPOOL/AthenaPoolUtilities
- Database/PersistentDataModel
- Event/EventInfo
- Event/EventInfoUtils
- Event/xAOD/xAODEventInfo
- GaudiKernel )
-
# Component(s) in the package:
atlas_add_component( OutputStreamAthenaPool
src/MakeEventStreamInfo.cxx
@@ -27,12 +11,8 @@ atlas_add_component( OutputStreamAthenaPool
src/EventInfoAttListTool.cxx
src/EventInfoTagBuilder.cxx
src/components/*.cxx
- LINK_LIBRARIES AthenaBaseComps AthenaKernel
- SGTools StoreGateLib SGtests AthenaPoolCnvSvcLib
- AthenaPoolUtilities PersistentDataModel EventInfo
- xAODEventInfo EventInfoUtils GaudiKernel )
+ LINK_LIBRARIES ${CORAL_LIBRARIES} AthenaBaseComps AthenaKernel EventInfo EventInfoUtils GaudiKernel PersistentDataModel StoreGateLib xAODEventInfo )
# Install files from the package:
-atlas_install_python_modules( python/*.py )
+atlas_install_python_modules( python/*.py POST_BUILD_CMD ${ATLAS_FLAKE8} )
atlas_install_joboptions( share/*.py )
-
diff --git a/Database/AthenaPOOL/OutputStreamAthenaPool/python/CreateOutputStreams.py b/Database/AthenaPOOL/OutputStreamAthenaPool/python/CreateOutputStreams.py
index 0434b3db2290afc700c94db4f04791bd1a2c7116..5776f3d1b5f6806f217973e77844daf37b6f5ef9 100644
--- a/Database/AthenaPOOL/OutputStreamAthenaPool/python/CreateOutputStreams.py
+++ b/Database/AthenaPOOL/OutputStreamAthenaPool/python/CreateOutputStreams.py
@@ -3,12 +3,10 @@
## @file OutputStreamAthenaPool.py
## @brief Helper methods to create output streams
## @author Peter van Gemmeren <gemmeren@bnl.gov>
-## $Id: OutputStreamAthenaPool.py,v 1.10 2009-04-27 18:19:34 gemmeren Exp $
###############################################################
from __future__ import print_function
-from AthenaCommon.AppMgr import theApp
from AthenaCommon.AppMgr import ServiceMgr as svcMgr
from AthenaServices.AthenaServicesConf import AthenaOutputStream
from AthenaServices.AthenaServicesConf import AthenaOutputStreamTool
@@ -48,7 +46,7 @@ def createOutputStream( streamName, fileName = "", asAlg = False, noTag = False,
# Tell tool to pick it up
outputStream.WritingTool.AttributeListKey=key
# build eventinfo attribute list
- from .OutputStreamAthenaPoolConf import EventInfoAttListTool, EventInfoTagBuilder
+ from .OutputStreamAthenaPoolConf import EventInfoTagBuilder
EventInfoTagBuilder = EventInfoTagBuilder(AttributeList=key, EventInfoKey=eventInfoKey, FilterString=decisionFilter)
from AthenaCommon.GlobalFlags import globalflags
if globalflags.InputFormat() == 'bytestream':
diff --git a/Database/AthenaPOOL/OutputStreamAthenaPool/python/MultipleStreamManager.py b/Database/AthenaPOOL/OutputStreamAthenaPool/python/MultipleStreamManager.py
index 7fea06f370e4f8022859615d13887c26ac352aec..6dc8f05cb06f320eb2ffb24a8dee1e697a21007a 100644
--- a/Database/AthenaPOOL/OutputStreamAthenaPool/python/MultipleStreamManager.py
+++ b/Database/AthenaPOOL/OutputStreamAthenaPool/python/MultipleStreamManager.py
@@ -169,7 +169,7 @@ class AugmentedPoolStream( AugmentedStreamBase ):
#event-by-event stream
from AthenaPoolCnvSvc.WriteAthenaPool import AthenaPoolOutputStream
self.Stream = AthenaPoolOutputStream( StreamName, FileName, asAlg, noTag=noTag )
- if isVirtual == True:
+ if isVirtual is True:
self.Stream.WriteOnExecute=False
self.Stream.WriteOnFinalize=False
@@ -264,8 +264,6 @@ class AugmentedByteStream( AugmentedStreamBase ):
#General setup
from AthenaCommon.AppMgr import theApp
svcMgr = theApp.serviceMgr()
- from AthenaCommon.AlgSequence import AlgSequence
- topSequence = AlgSequence()
# BS OutputStream Tool
from ByteStreamCnvSvc.ByteStreamCnvSvcConf import ByteStreamEventStorageOutputSvc,ByteStreamOutputStreamCopyTool
@@ -277,10 +275,9 @@ class AugmentedByteStream( AugmentedStreamBase ):
outDir+="/"
# BS output Svc
- from ByteStreamCnvSvc.ByteStreamCnvSvcConf import ByteStreamEventStorageOutputSvc
self.bsOutputSvc=ByteStreamEventStorageOutputSvc("BSESOutputSvc"+StreamName,
- OutputDirectory=outDir,
- SimpleFileName=FileName )
+ OutputDirectory=outDir,
+ SimpleFileName=FileName )
svcMgr += self.bsOutputSvc
# Set BS OutputSvc/InputSvc to BS OutputStream Tool
@@ -372,7 +369,7 @@ class AugmentedRootStream( AugmentedStreamBase ):
AugmentedStreamBase.__init__( self, StreamName )
# Check if the user specified a tree name or not:
- if TreeName == None:
+ if TreeName is None:
TreeName = StreamName
# Remember the file and tree names just for bookkeeping:
@@ -595,7 +592,7 @@ class MultipleStreamManager:
actual stream, or an algorithm.
"""
# Check if a file name was specified or not:
- if FileName == None:
+ if FileName is None:
FileName = StreamName + ".root"
# Use the common function for creating the stream:
return self.NewStream( StreamName, FileName, type='root', asAlg = asAlg,
@@ -647,12 +644,7 @@ class MultipleStreamManager:
return self.StreamList[index]
def StreamExists(self, StreamName):
- try:
- index=self.StreamDict[StreamName]
- except KeyError:
- return False
-
- return True
+ return StreamName in self.StreamDict
def Print(self):
print("**** MultipleStreamManager INFOS ****")
diff --git a/Database/AthenaPOOL/PoolSvc/CMakeLists.txt b/Database/AthenaPOOL/PoolSvc/CMakeLists.txt
index fe72af58145cb5b88bda14b9fddb83a63a8eddd3..140900a73ad9a93da028be034ad043af4d78b99c 100644
--- a/Database/AthenaPOOL/PoolSvc/CMakeLists.txt
+++ b/Database/AthenaPOOL/PoolSvc/CMakeLists.txt
@@ -1,27 +1,9 @@
-# $Id: CMakeLists.txt 739587 2016-04-12 08:08:58Z krasznaa $
-################################################################################
-# Package: PoolSvc
-################################################################################
+# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
+
# Declare the package name:
atlas_subdir( PoolSvc )
-# Declare the package's dependencies:
-atlas_depends_on_subdirs(
- PUBLIC
- Control/DataModelRoot
- Database/APR/CollectionBase
- Database/APR/PersistencySvc
- GaudiKernel
- PRIVATE
- Control/AthenaBaseComps
- Control/AthenaKernel
- Database/APR/StorageSvc
- Database/APR/FileCatalog
- Database/ConnectionManagement/DBReplicaSvc
- Database/PersistentDataModel
- Tools/PathResolver )
-
# External dependencies:
find_package( CORAL COMPONENTS CoralBase CoralKernel RelationalAccess )
@@ -34,9 +16,7 @@ atlas_add_library( PoolSvcLib
atlas_add_component( PoolSvc
PoolSvc/*.h src/*.cxx src/components/*.cxx
INCLUDE_DIRS ${CORAL_INCLUDE_DIRS}
- LINK_LIBRARIES ${CORAL_LIBRARIES} DataModelRoot CollectionBase
- PersistencySvc GaudiKernel FileCatalog
- AthenaBaseComps AthenaKernel StorageSvc PersistentDataModel PathResolver DBReplicaSvcLib )
+ LINK_LIBRARIES ${CORAL_LIBRARIES} AthenaBaseComps DBReplicaSvcLib FileCatalog POOLCore PathResolver PersistentDataModel PoolSvcLib StorageSvc )
# Install files from the package:
atlas_install_joboptions( share/*.py )
diff --git a/Database/AthenaPOOL/RootConversions/CMakeLists.txt b/Database/AthenaPOOL/RootConversions/CMakeLists.txt
index 8c1da670338e0ed80b0ee0cdf1233efdacd1d5ca..0201182569588c5f7dc4cfc2fa799cb293289c80 100644
--- a/Database/AthenaPOOL/RootConversions/CMakeLists.txt
+++ b/Database/AthenaPOOL/RootConversions/CMakeLists.txt
@@ -1,17 +1,8 @@
-################################################################################
-# Package: RootConversions
-################################################################################
-# Author: scott snyder <snyder@bnl.gov>
-################################################################################
+# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
# Declare the package name:
atlas_subdir( RootConversions )
-# Declare the package's dependencies:
-atlas_depends_on_subdirs( PRIVATE
- Control/RootUtils
- AtlasTest/TestTools )
-
# External dependencies:
find_package( ROOT COMPONENTS RIO Tree TreePlayer Core MathCore Hist pthread )
diff --git a/Database/AthenaPOOL/StlAthenaPoolCnv/CMakeLists.txt b/Database/AthenaPOOL/StlAthenaPoolCnv/CMakeLists.txt
index 26acdba56e72c87bcc5dff43daa38dac147ad0f7..6a301f1323e2e067a8457bc11823b6945ff28b87 100644
--- a/Database/AthenaPOOL/StlAthenaPoolCnv/CMakeLists.txt
+++ b/Database/AthenaPOOL/StlAthenaPoolCnv/CMakeLists.txt
@@ -1,19 +1,9 @@
-################################################################################
-# Package: StlAthenaPoolCnv
-################################################################################
+# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
# Declare the package name:
atlas_subdir( StlAthenaPoolCnv )
-# Declare the package's dependencies:
-atlas_depends_on_subdirs( PUBLIC
- GaudiKernel
- PRIVATE
- Control/SGTools
- Database/AthenaPOOL/AthenaPoolCnvSvc )
-
# Component(s) in the package:
atlas_add_component( StlAthenaPoolCnv
src/*.cxx
- LINK_LIBRARIES GaudiKernel SGTools AthenaPoolCnvSvcLib )
-
+ LINK_LIBRARIES SGTools AthenaPoolCnvSvcLib )
diff --git a/Database/AthenaRoot/AthenaRootComps/CMakeLists.txt b/Database/AthenaRoot/AthenaRootComps/CMakeLists.txt
index 9108375ac40b7f4a4e95eda1ae49164cf6a359ab..fea3eb676f44e6a7554be451e67a68d3e0aaf02b 100644
--- a/Database/AthenaRoot/AthenaRootComps/CMakeLists.txt
+++ b/Database/AthenaRoot/AthenaRootComps/CMakeLists.txt
@@ -1,57 +1,37 @@
-################################################################################
-# Package: AthenaRootComps
-################################################################################
+# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
# Declare the package name:
atlas_subdir( AthenaRootComps )
-# Declare the package's dependencies:
-atlas_depends_on_subdirs( PUBLIC
- Control/SGTools
- PRIVATE
- Control/AthenaBaseComps
- Control/AthenaKernel
- Control/AthenaPython
- Control/DataModelRoot
- Control/RootUtils
- Control/StoreGate
- Database/APR/CollectionBase
- Database/APR/CollectionUtilities
- Database/APR/FileCatalog
- Database/APR/PersistencySvc
- Database/AthenaRoot/AthenaRootKernel
- Database/PersistentDataModel
- Database/AthenaPOOL/PoolSvc
- Event/EventInfo
- Event/xAOD/xAODEventInfo
- GaudiKernel
- Control/xAODRootAccess)
-
# External dependencies:
find_package( ROOT COMPONENTS RIO Core Graf Tree MathCore Hist pthread )
find_package( Xrootd )
find_package( Boost )
# Component(s) in the package:
+atlas_add_library( AthenaRootCompsLib
+ AthenaRootComps/*.h
+ INTERFACE
+ PUBLIC_HEADERS AthenaRootComps
+ INCLUDE_DIRS ${ROOT_INCLUDE_DIRS}
+ LINK_LIBRARIES ${ROOT_LIBRARIES} AthenaKernel )
+
atlas_add_component( AthenaRootComps
src/*.cxx
src/components/*.cxx
INCLUDE_DIRS ${ROOT_INCLUDE_DIRS} ${Boost_INCLUDE_DIRS}
- LINK_LIBRARIES ${ROOT_LIBRARIES} ${Boost_LIBRARIES} SGTools AthenaBaseComps AthenaKernel DataModelRoot RootUtils RootUtilsPyROOT StoreGateLib SGtests CollectionBase CollectionUtilities FileCatalog PersistencySvc AthenaRootKernel PersistentDataModel EventInfo GaudiKernel xAODRootAccess xAODEventInfo PoolSvcLib )
+ LINK_LIBRARIES ${Boost_LIBRARIES} ${ROOT_LIBRARIES} AthenaBaseComps AthenaKernel AthenaRootCompsLib AthenaRootKernel DataModelRoot EventInfo FileCatalog GaudiKernel PersistentDataModel PoolSvcLib RootUtils SGTools StoreGateLib xAODCore xAODEventInfo xAODRootAccess )
# Install files from the package:
-atlas_install_headers( AthenaRootComps )
atlas_install_python_modules( python/*.py )
atlas_install_joboptions( share/tests/*.py )
atlas_install_scripts( test/*.sh test/ref.* test/*.py )
-
atlas_add_test( test_athena_ntuple_dumper_multiple
SCRIPT test/test_athena_ntuple_dumper_multiple.sh
POST_EXEC_SCRIPT nopost.sh
PROPERTIES TIMEOUT 600 )
-
atlas_add_test( test_athena_ntuple_dumper_varhandles_nooutput
SCRIPT test/test_athena_ntuple_dumper_varhandles_nooutput.sh
POST_EXEC_SCRIPT nopost.sh
diff --git a/Database/AthenaRoot/AthenaRootKernel/CMakeLists.txt b/Database/AthenaRoot/AthenaRootKernel/CMakeLists.txt
index 20a78956568c2eee90a024aa0a7750bb5cdb1ab2..c9b4a9f9c5ce059e56c6f41c84ed5fed92843777 100644
--- a/Database/AthenaRoot/AthenaRootKernel/CMakeLists.txt
+++ b/Database/AthenaRoot/AthenaRootKernel/CMakeLists.txt
@@ -1,18 +1,10 @@
-################################################################################
-# Package: AthenaRootKernel
-################################################################################
+# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
# Declare the package name:
atlas_subdir( AthenaRootKernel )
-# Declare the package's dependencies:
-atlas_depends_on_subdirs( PUBLIC
- Control/DataModelRoot
- GaudiKernel )
-
# Component(s) in the package:
atlas_add_library( AthenaRootKernel
src/*.cxx
PUBLIC_HEADERS AthenaRootKernel
LINK_LIBRARIES DataModelRoot GaudiKernel )
-
diff --git a/Database/AthenaRoot/RootAuxDynIO/CMakeLists.txt b/Database/AthenaRoot/RootAuxDynIO/CMakeLists.txt
index 8d557fc5cd80db5daf0d3937c6bcb66367301aa6..fec998fdaf2da5ca19e161f6991270181660bdc9 100644
--- a/Database/AthenaRoot/RootAuxDynIO/CMakeLists.txt
+++ b/Database/AthenaRoot/RootAuxDynIO/CMakeLists.txt
@@ -1,20 +1,8 @@
-################################################################################
-# Package: RootAuxDynIO
-################################################################################
+# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
# Declare the package name:
atlas_subdir( RootAuxDynIO )
-# Declare the package's dependencies:
-atlas_depends_on_subdirs( PRIVATE
- AtlasTest/TestTools
- Control/RootUtils
- Control/AthContainers
- Control/AthContainersRoot
- Control/AthContainersInterfaces
- Database/AthenaRoot/AthenaRootComps
- GaudiKernel )
-
find_package( ROOT COMPONENTS Core RIO Tree )
# Component(s) in the package:
@@ -23,4 +11,4 @@ atlas_add_library( RootAuxDynIO
PUBLIC_HEADERS RootAuxDynIO
INCLUDE_DIRS ${ROOT_INCLUDE_DIRS}
LINK_LIBRARIES ${ROOT_LIBRARIES}
- PRIVATE_LINK_LIBRARIES TestTools AthContainers AthContainersRoot RootUtils GaudiKernel )
+ PRIVATE_LINK_LIBRARIES ${ROOT_LIBRARIES} AthContainers AthContainersInterfaces AthContainersRoot RootUtils )