diff --git a/Control/AthContainersRoot/CMakeLists.txt b/Control/AthContainersRoot/CMakeLists.txt
index 7e80cbc8b6638d5ee7f932b312fac654632c1b80..4458818f04969a507fd3ddb9e5e6367ef6d63e98 100644
--- a/Control/AthContainersRoot/CMakeLists.txt
+++ b/Control/AthContainersRoot/CMakeLists.txt
@@ -1,30 +1,18 @@
-################################################################################
-# Package: AthContainersRoot
-################################################################################
+#Copyright (C) 2020 CERN for the benefit of the ATLAS collaboration
# Declare the package name:
atlas_subdir( AthContainersRoot )
-# Declare the package's dependencies:
-atlas_depends_on_subdirs( PUBLIC
- GaudiKernel
- Control/AthContainersInterfaces
- Control/RootUtils
- PRIVATE
- AtlasTest/TestTools
- Control/AthContainers
- Control/AthLinks
- Control/CxxUtils )
-
# External dependencies:
-find_package( ROOT COMPONENTS Core )
+find_package( ROOT COMPONENTS Core Tree )
# Component(s) in the package:
atlas_add_library( AthContainersRoot
src/*.cxx
PUBLIC_HEADERS AthContainersRoot
PRIVATE_INCLUDE_DIRS ${ROOT_INCLUDE_DIRS}
- PRIVATE_LINK_LIBRARIES ${ROOT_LIBRARIES} AthContainers AthLinks RootUtils )
+ PRIVATE_LINK_LIBRARIES ${ROOT_LIBRARIES} AthContainers AthLinks CxxUtils RootUtils
+ LINK_LIBRARIES AthenaKernel GaudiKernel AthContainersInterfaces )
atlas_add_dictionary( AthContainersRootTestDict
diff --git a/Control/AthenaMonitoring/CMakeLists.txt b/Control/AthenaMonitoring/CMakeLists.txt
index 2be46e8697138b4bd6920910ea4e5fb5a5b69f50..ca5e9b503c19059f04a8e9bf01347a3490abe786 100644
--- a/Control/AthenaMonitoring/CMakeLists.txt
+++ b/Control/AthenaMonitoring/CMakeLists.txt
@@ -5,7 +5,7 @@ atlas_subdir( AthenaMonitoring )
# External dependencies:
find_package( CORAL COMPONENTS CoralBase CoralKernel RelationalAccess )
-find_package( ROOT COMPONENTS Core Hist )
+find_package( ROOT COMPONENTS Core Hist MathCore )
find_package( Boost )
# Component(s) in the package:
diff --git a/Control/DataModelAthenaPool/CMakeLists.txt b/Control/DataModelAthenaPool/CMakeLists.txt
index e09566b6213c3b7c24fefde2524598024db5856a..19e155bd76f4c48cd27e9c733c0c006a39f3d9fd 100644
--- a/Control/DataModelAthenaPool/CMakeLists.txt
+++ b/Control/DataModelAthenaPool/CMakeLists.txt
@@ -1,29 +1,11 @@
-################################################################################
-# Package: DataModelAthenaPool
-################################################################################
+# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
# Declare the package name:
atlas_subdir( DataModelAthenaPool )
-# Declare the package's dependencies:
-atlas_depends_on_subdirs( PUBLIC
- Control/AthContainers
- Control/AthLinks
- Control/AthenaBaseComps
- Control/AthenaKernel
- Control/Navigation
- Control/RootUtils
- Database/AthenaPOOL/AthenaPoolCnvSvc
- GaudiKernel
- PRIVATE
- AtlasTest/TestTools
- Control/SGTools
- Database/AthenaPOOL/AthenaPoolUtilities
- Database/AthenaPOOL/RootConversions )
-
# External dependencies:
find_package( CLHEP )
-find_package( ROOT COMPONENTS Core Tree MathCore Hist RIO pthread )
+find_package( ROOT COMPONENTS Core RIO )
# Component(s) in the package:
atlas_add_library( DataModelAthenaPoolLib
@@ -31,70 +13,36 @@ atlas_add_library( DataModelAthenaPoolLib
PUBLIC_HEADERS DataModelAthenaPool
PRIVATE_INCLUDE_DIRS ${ROOT_INCLUDE_DIRS} ${CLHEP_INCLUDE_DIRS}
PRIVATE_DEFINITIONS ${CLHEP_DEFINITIONS}
- LINK_LIBRARIES AthContainers AthLinks AthenaBaseComps AthenaKernel Navigation RootUtils GaudiKernel RootUtilsPyROOT AthenaPoolCnvSvcLib
- PRIVATE_LINK_LIBRARIES ${ROOT_LIBRARIES} ${CLHEP_LIBRARIES} TestTools SGTools AthenaPoolUtilities RootConversions )
+ LINK_LIBRARIES AthLinks AthenaBaseComps AthenaKernel AthenaPoolCnvSvcLib GaudiKernel Navigation RootUtils
+ PRIVATE_LINK_LIBRARIES ${CLHEP_LIBRARIES} ${ROOT_LIBRARIES} AthContainers RootConversions )
atlas_add_component( DataModelAthenaPool
src/components/*.cxx
- INCLUDE_DIRS ${ROOT_INCLUDE_DIRS} ${CLHEP_INCLUDE_DIRS}
LINK_LIBRARIES DataModelAthenaPoolLib )
atlas_add_dictionary( DataModelAthenaPoolDictDict
DataModelAthenaPool/DataModelAthenaPoolDict.h
DataModelAthenaPool/selection.xml
- INCLUDE_DIRS ${ROOT_INCLUDE_DIRS} ${CLHEP_INCLUDE_DIRS}
- LINK_LIBRARIES ${ROOT_LIBRARIES} ${CLHEP_LIBRARIES} AthContainers AthLinks AthenaBaseComps AthenaKernel Navigation RootUtils RootUtilsPyROOT GaudiKernel TestTools SGTools AthenaPoolCnvSvcLib AthenaPoolUtilities RootConversions DataModelAthenaPoolLib )
-
-atlas_add_test( DataLink_p2_test
- SOURCES
- test/DataLink_p2_test.cxx
- INCLUDE_DIRS ${ROOT_INCLUDE_DIRS} ${CLHEP_INCLUDE_DIRS}
- LINK_LIBRARIES ${ROOT_LIBRARIES} ${CLHEP_LIBRARIES} AthContainers AthLinks AthenaBaseComps AthenaKernel Navigation RootUtils RootUtilsPyROOT GaudiKernel TestTools SGTools AthenaPoolCnvSvcLib AthenaPoolUtilities RootConversions DataModelAthenaPoolLib )
-
-atlas_add_test( ElementLinkCnv_p1_test
- SOURCES
- test/ElementLinkCnv_p1_test.cxx
- INCLUDE_DIRS ${ROOT_INCLUDE_DIRS} ${CLHEP_INCLUDE_DIRS}
- LINK_LIBRARIES ${ROOT_LIBRARIES} ${CLHEP_LIBRARIES} AthContainers AthLinks AthenaBaseComps AthenaKernel Navigation RootUtils RootUtilsPyROOT GaudiKernel TestTools SGTools AthenaPoolCnvSvcLib AthenaPoolUtilities RootConversions DataModelAthenaPoolLib )
-
-atlas_add_test( ElementLinkCnv_p2_test
- SOURCES
- test/ElementLinkCnv_p2_test.cxx
- INCLUDE_DIRS ${ROOT_INCLUDE_DIRS} ${CLHEP_INCLUDE_DIRS}
- LINK_LIBRARIES ${ROOT_LIBRARIES} ${CLHEP_LIBRARIES} AthContainers AthLinks AthenaBaseComps AthenaKernel Navigation RootUtils RootUtilsPyROOT GaudiKernel TestTools SGTools AthenaPoolCnvSvcLib AthenaPoolUtilities RootConversions DataModelAthenaPoolLib )
-
-atlas_add_test( ElementLinkCnv_p3_test
- SOURCES
- test/ElementLinkCnv_p3_test.cxx
- INCLUDE_DIRS ${ROOT_INCLUDE_DIRS} ${CLHEP_INCLUDE_DIRS}
- LINK_LIBRARIES ${ROOT_LIBRARIES} ${CLHEP_LIBRARIES} AthContainers AthLinks AthenaBaseComps AthenaKernel Navigation RootUtils RootUtilsPyROOT GaudiKernel TestTools SGTools AthenaPoolCnvSvcLib AthenaPoolUtilities RootConversions DataModelAthenaPoolLib )
-
-atlas_add_test( NavigableCnv_p1_test
- SOURCES
- test/NavigableCnv_p1_test.cxx
- INCLUDE_DIRS ${ROOT_INCLUDE_DIRS} ${CLHEP_INCLUDE_DIRS}
- LINK_LIBRARIES ${ROOT_LIBRARIES} ${CLHEP_LIBRARIES} AthContainers AthLinks AthenaBaseComps AthenaKernel Navigation RootUtils RootUtilsPyROOT GaudiKernel TestTools SGTools AthenaPoolCnvSvcLib AthenaPoolUtilities RootConversions DataModelAthenaPoolLib )
-
-atlas_add_test( NavigableCnv_p2_test
- SOURCES
- test/NavigableCnv_p2_test.cxx
- INCLUDE_DIRS ${ROOT_INCLUDE_DIRS} ${CLHEP_INCLUDE_DIRS}
- LINK_LIBRARIES ${ROOT_LIBRARIES} ${CLHEP_LIBRARIES} AthContainers AthLinks AthenaBaseComps AthenaKernel Navigation RootUtils RootUtilsPyROOT GaudiKernel TestTools SGTools AthenaPoolCnvSvcLib AthenaPoolUtilities RootConversions DataModelAthenaPoolLib )
-
-atlas_add_test( ElementLinkVectorCnv_p1_test
- SOURCES
- test/ElementLinkVectorCnv_p1_test.cxx
- INCLUDE_DIRS ${ROOT_INCLUDE_DIRS} ${CLHEP_INCLUDE_DIRS}
- LINK_LIBRARIES ${ROOT_LIBRARIES} ${CLHEP_LIBRARIES} AthContainers AthLinks AthenaBaseComps AthenaKernel Navigation RootUtils RootUtilsPyROOT GaudiKernel TestTools SGTools AthenaPoolCnvSvcLib AthenaPoolUtilities RootConversions DataModelAthenaPoolLib )
-
-atlas_add_test( VectorElementLinkCnv_p1_test
- SOURCES
- test/VectorElementLinkCnv_p1_test.cxx
- INCLUDE_DIRS ${ROOT_INCLUDE_DIRS} ${CLHEP_INCLUDE_DIRS}
- LINK_LIBRARIES ${ROOT_LIBRARIES} ${CLHEP_LIBRARIES} AthContainers AthLinks AthenaBaseComps AthenaKernel Navigation RootUtils RootUtilsPyROOT GaudiKernel TestTools SGTools AthenaPoolCnvSvcLib AthenaPoolUtilities RootConversions DataModelAthenaPoolLib )
+ LINK_LIBRARIES DataModelAthenaPoolLib )
# Install files from the package:
-atlas_install_python_modules( python/*.py
- POST_BUILD_CMD ${ATLAS_FLAKE8} )
+atlas_install_python_modules( python/*.py POST_BUILD_CMD ${ATLAS_FLAKE8} )
atlas_install_joboptions( share/DataModelAthenaPool_jobOptions.py )
+# Tests in the package:
+function( _add_test name )
+ atlas_add_test( ${name}
+ SOURCES
+ test/${name}.cxx
+ LINK_LIBRARIES DataModelAthenaPoolLib SGTools )
+endfunction( _add_test )
+
+_add_test( DataLink_p2_test )
+_add_test( ElementLinkCnv_p1_test )
+_add_test( ElementLinkCnv_p2_test )
+_add_test( ElementLinkCnv_p3_test )
+_add_test( NavigableCnv_p1_test )
+_add_test( NavigableCnv_p2_test )
+_add_test( ElementLinkVectorCnv_p1_test )
+_add_test( VectorElementLinkCnv_p1_test )
+
diff --git a/Control/DataModelRoot/CMakeLists.txt b/Control/DataModelRoot/CMakeLists.txt
index ba8b1ba365fc7bccd2a99ddd4f20813f2ea7006b..d440eb34ca01035bc276d23e48fec3c199bb1e70 100644
--- a/Control/DataModelRoot/CMakeLists.txt
+++ b/Control/DataModelRoot/CMakeLists.txt
@@ -1,29 +1,20 @@
-################################################################################
-# Package: DataModelRoot
-################################################################################
+# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
# Declare the package name:
atlas_subdir( DataModelRoot )
-atlas_depends_on_subdirs (
- PUBLIC
- Control/CxxUtils
- PRIVATE
- Control/RootUtils )
-
# External dependencies:
-find_package( ROOT COMPONENTS Core Tree MathCore Hist RIO pthread )
+find_package( ROOT COMPONENTS Core RIO )
# Component(s) in the package:
atlas_add_library( DataModelRoot
src/*.cxx
PUBLIC_HEADERS DataModelRoot
INCLUDE_DIRS ${ROOT_INCLUDE_DIRS}
- LINK_LIBRARIES RootUtils ${ROOT_LIBRARIES} )
+ LINK_LIBRARIES ${ROOT_LIBRARIES} CxxUtils
+ PRIVATE_LINK_LIBRARIES RootUtils )
atlas_add_dictionary( DataModelRootDict
DataModelRoot/DataModelRootDict.h
DataModelRoot/selection.xml
- INCLUDE_DIRS ${ROOT_INCLUDE_DIRS}
- LINK_LIBRARIES ${ROOT_LIBRARIES} DataModelRoot )
-
+ LINK_LIBRARIES DataModelRoot )
diff --git a/Control/DataModelTest/DataModelTestDataCommon/CMakeLists.txt b/Control/DataModelTest/DataModelTestDataCommon/CMakeLists.txt
index 58266754b72a77ad7a9e4227a9c5775e495453de..1be2dece11432261ff94162de45ef22aaf492359 100644
--- a/Control/DataModelTest/DataModelTestDataCommon/CMakeLists.txt
+++ b/Control/DataModelTest/DataModelTestDataCommon/CMakeLists.txt
@@ -1,28 +1,8 @@
-################################################################################
-# Package: DataModelTestDataCommon
-################################################################################
+# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
# Declare the package name:
atlas_subdir( DataModelTestDataCommon )
-# Declare the package's dependencies:
-atlas_depends_on_subdirs( PUBLIC
- Control/AthContainers
- Control/AthContainersInterfaces
- Control/AthenaKernel
- Event/xAOD/xAODCore
- Event/xAOD/xAODTrigger
- GaudiKernel
- PRIVATE
- Event/EventInfo
- Control/AthLinks
- Control/StoreGate
- Control/AthenaBaseComps
- Database/AthenaPOOL/AthenaPoolUtilities
- Database/RegistrationServices
- Database/PersistentDataModel
- Trigger/TrigDataAccess/TrigSerializeCnvSvc )
-
# External dependencies:
find_package( ROOT COMPONENTS Core Tree MathCore Hist RIO pthread )
@@ -31,29 +11,27 @@ atlas_add_library( DataModelTestDataCommonLib
src/*.cxx
PUBLIC_HEADERS DataModelTestDataCommon
PRIVATE_INCLUDE_DIRS ${ROOT_INCLUDE_DIRS}
- LINK_LIBRARIES AthContainers AthenaKernel xAODCore xAODTrigger EventInfo GaudiKernel
- PRIVATE_LINK_LIBRARIES ${ROOT_LIBRARIES} AthLinks StoreGateLib AthenaBaseComps AthenaPoolUtilities RegistrationServicesLib )
+ LINK_LIBRARIES AthContainers AthContainersInterfaces AthenaPoolUtilities AthLinks AthenaKernel EventInfo GaudiKernel RegistrationServicesLib xAODCore xAODTrigger
+ PRIVATE_LINK_LIBRARIES ${ROOT_LIBRARIES} AthenaBaseComps CxxUtils PersistentDataModel StoreGateLib )
atlas_add_component( DataModelTestDataCommon
src/components/*.cxx
- INCLUDE_DIRS ${ROOT_INCLUDE_DIRS}
- LINK_LIBRARIES ${ROOT_LIBRARIES} AthContainers AthLinks DataModelAthenaPoolLib AthenaKernel xAODCore GaudiKernel AthenaBaseComps AthenaKernel CxxUtils StoreGateLib SGtests TrigSteeringEvent DataModelTestDataCommonLib PersistentDataModel RegistrationServicesLib )
+ LINK_LIBRARIES DataModelTestDataCommonLib )
atlas_add_dictionary( DataModelTestDataCommonDict
DataModelTestDataCommon/DataModelTestDataCommonDict.h
DataModelTestDataCommon/selection.xml
INCLUDE_DIRS ${ROOT_INCLUDE_DIRS}
- LINK_LIBRARIES ${ROOT_LIBRARIES} AthContainers AthenaKernel xAODCore xAODTrigger GaudiKernel AthLinks DataModelTestDataCommonLib
+ LINK_LIBRARIES DataModelTestDataCommonLib
NO_ROOTMAP_MERGE
EXTRA_FILES src/dict/*.cxx
ELEMENT_LINKS DMTest::BAuxVec DMTest::CVec_v1 )
-
atlas_add_sercnv_library ( DataModelTestDataCommonSerCnv
- FILES DataModelTestDataCommon/CVec.h DataModelTestDataCommon/CView.h DataModelTestDataCommon/CAuxContainer.h
- TYPES_WITH_NAMESPACE DMTest::CVec DMTest::CView DMTest::CAuxContainer
- INCLUDE_DIRS ${ROOT_INCLUDE_DIRS}
- LINK_LIBRARIES ${ROOT_LIBRARIES} AthContainers AthenaKernel xAODCore xAODTrigger GaudiKernel AthLinks TrigSerializeCnvSvcLib DataModelTestDataCommonLib )
+ FILES DataModelTestDataCommon/CVec.h DataModelTestDataCommon/CView.h DataModelTestDataCommon/CAuxContainer.h
+ TYPES_WITH_NAMESPACE DMTest::CVec DMTest::CView DMTest::CAuxContainer
+ INCLUDE_DIRS ${ROOT_INCLUDE_DIRS}
+ LINK_LIBRARIES ${ROOT_LIBRARIES} DataModelTestDataCommonLib TrigSerializeCnvSvcLib )
# Install files from the package:
atlas_install_scripts( scripts/*.py )
diff --git a/Control/DataModelTest/DataModelTestDataRead/CMakeLists.txt b/Control/DataModelTest/DataModelTestDataRead/CMakeLists.txt
index f50079e43ee51ef2ea9b96b877893c13cd5c6356..7d7b724a907b8128707c0fa2a55805dd246285b0 100644
--- a/Control/DataModelTest/DataModelTestDataRead/CMakeLists.txt
+++ b/Control/DataModelTest/DataModelTestDataRead/CMakeLists.txt
@@ -1,55 +1,28 @@
-################################################################################
-# Package: DataModelTestDataRead
-################################################################################
+# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
# Declare the package name:
atlas_subdir( DataModelTestDataRead )
-# Declare the package's dependencies:
-atlas_depends_on_subdirs( PUBLIC
- Control/AthContainers
- Control/AthLinks
- Control/AthenaKernel
- Control/DataModelAthenaPool
- Control/DataModelTest/DataModelTestDataCommon
- GaudiKernel
- PRIVATE
- Control/AthContainersInterfaces
- Control/AthenaBaseComps
- Control/CxxUtils
- Control/StoreGate
- Event/xAOD/xAODCore
- Trigger/TrigEvent/TrigSteeringEvent
- Trigger/TrigEvent/TrigNavigation )
-
-# External dependencies:
-find_package( ROOT COMPONENTS Core Tree MathCore Hist RIO pthread )
-
# Component(s) in the package:
atlas_add_library( DataModelTestDataReadLib
src/*.cxx
PUBLIC_HEADERS DataModelTestDataRead
- PRIVATE_INCLUDE_DIRS ${ROOT_INCLUDE_DIRS}
- LINK_LIBRARIES AthContainers AthLinks DataModelTestDataCommonLib GaudiKernel DataModelAthenaPoolLib StoreGateLib SGtests TrigSteeringEvent TrigNavigationLib
- PRIVATE_LINK_LIBRARIES ${ROOT_LIBRARIES} AthenaBaseComps AthenaKernel CxxUtils xAODCore )
+ LINK_LIBRARIES AthContainers AthLinks AthenaKernel DataModelAthenaPoolLib DataModelTestDataCommonLib TrigNavigationLib xAODCore
+ PRIVATE_LINK_LIBRARIES AthContainersInterfaces AthenaBaseComps CxxUtils GaudiKernel StoreGateLib TrigSteeringEvent )
atlas_add_component( DataModelTestDataRead
src/components/*.cxx
- INCLUDE_DIRS ${ROOT_INCLUDE_DIRS}
- LINK_LIBRARIES ${ROOT_LIBRARIES} AthContainers AthLinks DataModelAthenaPoolLib DataModelTestDataCommonLib GaudiKernel AthenaBaseComps AthenaKernel CxxUtils StoreGateLib SGtests xAODCore TrigSteeringEvent DataModelTestDataReadLib )
+ LINK_LIBRARIES DataModelTestDataReadLib )
atlas_add_dictionary( DataModelTestDataReadDict
DataModelTestDataRead/DataModelTestDataReadDict.h
DataModelTestDataRead/selection.xml
- INCLUDE_DIRS ${ROOT_INCLUDE_DIRS}
- LINK_LIBRARIES ${ROOT_LIBRARIES} AthContainers AthLinks DataModelAthenaPoolLib DataModelTestDataCommonLib GaudiKernel AthenaBaseComps AthenaKernel CxxUtils StoreGateLib SGtests xAODCore DataModelTestDataReadLib
+ LINK_LIBRARIES DataModelTestDataReadLib
NO_ROOTMAP_MERGE
EXTRA_FILES src/dict/*.cxx
ELEMENT_LINKS DataVector<DMTest::B> )
-
atlas_add_sercnv_library ( DataModelTestDataReadSerCnv
FILES DataModelTestDataRead/HVec.h DataModelTestDataRead/HView.h DataModelTestDataRead/HAuxContainer.h
TYPES_WITH_NAMESPACE DMTest::HVec DMTest::HView DMTest::HAuxContainer
- INCLUDE_DIRS ${ROOT_INCLUDE_DIRS}
- LINK_LIBRARIES ${ROOT_LIBRARIES} AthContainers xAODCore xAODTrigger GaudiKernel AthLinks TrigSerializeCnvSvcLib DataModelTestDataCommonLib DataModelTestDataReadLib )
+ LINK_LIBRARIES DataModelTestDataReadLib TrigSerializeCnvSvcLib )
diff --git a/Control/DataModelTest/DataModelTestDataReadCnv/CMakeLists.txt b/Control/DataModelTest/DataModelTestDataReadCnv/CMakeLists.txt
index a9ade5a93433a6a7fa4a8191fec0c2bcf34b1d26..410f15da91ddfee5d4f30a1f4135ae207c411969 100644
--- a/Control/DataModelTest/DataModelTestDataReadCnv/CMakeLists.txt
+++ b/Control/DataModelTest/DataModelTestDataReadCnv/CMakeLists.txt
@@ -1,21 +1,8 @@
-################################################################################
-# Package: DataModelTestDataReadCnv
-################################################################################
+# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
# Declare the package name:
atlas_subdir( DataModelTestDataReadCnv )
-# Declare the package's dependencies:
-atlas_depends_on_subdirs( PUBLIC
- Database/AthenaPOOL/AthenaPoolUtilities
- PRIVATE
- Control/AthenaKernel
- Control/DataModelTest/DataModelTestDataCommon
- Control/DataModelTest/DataModelTestDataRead
- Database/AthenaPOOL/AthenaPoolCnvSvc )
-
-# tag no_merge_componentslist was not recognized in automatic conversion in cmt2cmake
-
# Component(s) in the package:
atlas_add_poolcnv_library( DataModelTestDataReadCnvPoolCnv
src/*.cxx
diff --git a/Control/DataModelTest/DataModelTestDataWrite/CMakeLists.txt b/Control/DataModelTest/DataModelTestDataWrite/CMakeLists.txt
index 66ec36d5e5ef3c2dd5474cf368079b3bb58f526a..2e619ecb3f8fa2a59401d4d829dde16e907476bb 100644
--- a/Control/DataModelTest/DataModelTestDataWrite/CMakeLists.txt
+++ b/Control/DataModelTest/DataModelTestDataWrite/CMakeLists.txt
@@ -1,56 +1,28 @@
-################################################################################
-# Package: DataModelTestDataWrite
-################################################################################
+# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
# Declare the package name:
atlas_subdir( DataModelTestDataWrite )
-# Declare the package's dependencies:
-atlas_depends_on_subdirs( PUBLIC
- Control/AthContainers
- Control/AthLinks
- Control/AthenaKernel
- Control/DataModelAthenaPool
- Control/DataModelTest/DataModelTestDataCommon
- Event/xAOD/xAODCore
- GaudiKernel
- PRIVATE
- Trigger/TrigEvent/TrigSteeringEvent
- Trigger/TrigEvent/TrigNavigation
- Control/AthContainersInterfaces
- Control/AthenaBaseComps
- Control/CxxUtils
- Control/StoreGate )
-
-# External dependencies:
-find_package( ROOT COMPONENTS Core Tree MathCore Hist RIO pthread )
-
# Component(s) in the package:
atlas_add_library( DataModelTestDataWriteLib
src/*.cxx
PUBLIC_HEADERS DataModelTestDataWrite
- PRIVATE_INCLUDE_DIRS ${ROOT_INCLUDE_DIRS}
- LINK_LIBRARIES AthContainers AthLinks DataModelTestDataCommonLib xAODCore GaudiKernel DataModelAthenaPoolLib StoreGateLib SGtests TrigNavigationLib TrigSteeringEvent
- PRIVATE_LINK_LIBRARIES ${ROOT_LIBRARIES} AthenaBaseComps AthenaKernel CxxUtils )
+ LINK_LIBRARIES AthContainers AthLinks AthenaKernel DataModelAthenaPoolLib DataModelTestDataCommonLib TrigNavigationLib xAODCore
+ PRIVATE_LINK_LIBRARIES AthContainersInterfaces AthenaBaseComps GaudiKernel StoreGateLib TrigSteeringEvent )
atlas_add_component( DataModelTestDataWrite
src/components/*.cxx
- INCLUDE_DIRS ${ROOT_INCLUDE_DIRS}
- LINK_LIBRARIES ${ROOT_LIBRARIES} AthContainers AthLinks DataModelAthenaPoolLib DataModelTestDataCommonLib xAODCore GaudiKernel AthenaBaseComps AthenaKernel CxxUtils StoreGateLib SGtests TrigSteeringEvent DataModelTestDataWriteLib )
+ LINK_LIBRARIES DataModelTestDataWriteLib )
atlas_add_dictionary( DataModelTestDataWriteDict
DataModelTestDataWrite/DataModelTestDataWriteDict.h
DataModelTestDataWrite/selection.xml
- INCLUDE_DIRS ${ROOT_INCLUDE_DIRS}
- LINK_LIBRARIES ${ROOT_LIBRARIES} AthContainers AthLinks DataModelAthenaPoolLib DataModelTestDataCommonLib xAODCore GaudiKernel AthenaBaseComps AthenaKernel CxxUtils StoreGateLib SGtests DataModelTestDataWriteLib
+ LINK_LIBRARIES DataModelTestDataWriteLib
NO_ROOTMAP_MERGE
EXTRA_FILES src/dict/*.cxx
ELEMENT_LINKS DataVector<DMTest::B> )
-
-
atlas_add_sercnv_library ( DataModelTestDataWriteSerCnv
FILES DataModelTestDataWrite/HVec.h DataModelTestDataWrite/HView.h DataModelTestDataWrite/HAuxContainer.h
TYPES_WITH_NAMESPACE DMTest::HVec DMTest::HView DMTest::HAuxContainer
- INCLUDE_DIRS ${ROOT_INCLUDE_DIRS}
- LINK_LIBRARIES ${ROOT_LIBRARIES} AthContainers xAODCore xAODTrigger GaudiKernel AthLinks TrigSerializeCnvSvcLib DataModelTestDataCommonLib DataModelTestDataWriteLib )
+ LINK_LIBRARIES DataModelTestDataWriteLib TrigSerializeCnvSvcLib )
diff --git a/Control/DataModelTest/DataModelTestDataWriteCnv/CMakeLists.txt b/Control/DataModelTest/DataModelTestDataWriteCnv/CMakeLists.txt
index 6c2c91a569fb58012560c6911371f6f07c8e61b4..e629baee950adf6f5905fe32dcd50dab82d5d1f6 100644
--- a/Control/DataModelTest/DataModelTestDataWriteCnv/CMakeLists.txt
+++ b/Control/DataModelTest/DataModelTestDataWriteCnv/CMakeLists.txt
@@ -1,21 +1,8 @@
-################################################################################
-# Package: DataModelTestDataWriteCnv
-################################################################################
+# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
# Declare the package name:
atlas_subdir( DataModelTestDataWriteCnv )
-# Declare the package's dependencies:
-atlas_depends_on_subdirs( PUBLIC
- Database/AthenaPOOL/AthenaPoolUtilities
- PRIVATE
- Control/DataModelTest/DataModelTestDataCommon
- Control/DataModelTest/DataModelTestDataWrite
- Database/AthenaPOOL/AthenaPoolCnvSvc )
-
-# External dependencies:
-find_package( ROOT COMPONENTS Core Tree MathCore Hist RIO pthread )
-
atlas_add_library( DataModelTestDataWriteCnv
DataModelTestDataWriteCnv/CLinksAOD_p1.h
INTERFACE
@@ -29,11 +16,9 @@ atlas_add_poolcnv_library( DataModelTestDataWriteCnvPoolCnv
TYPES_WITH_NAMESPACE DMTest::BVec DMTest::DVec DMTest::DDer DMTest::BDer DMTest::ELVec DMTest::BAux DMTest::BAuxVec DMTest::BAuxStandalone DMTest::C DMTest::CVec DMTest::CAuxContainer DMTest::G DMTest::GVec DMTest::GAuxContainer DMTest::CVecWithData DMTest::CInfoAuxContainer DMTest::CTrigAuxContainer DMTest::CView DMTest::H DMTest::HVec DMTest::HAuxContainer DMTest::HView DMTest::S1 DMTest::S2 DMTest::CLinks DMTest::CLinksContainer DMTest::CLinksAuxInfo DMTest::CLinksAuxContainer DMTest::CLinksAOD
LINK_LIBRARIES AthenaPoolUtilities DataModelTestDataCommonLib DataModelTestDataWriteLib AthenaPoolCnvSvcLib DataModelTestDataWriteCnv )
-
atlas_add_dictionary( DataModelTestDataWriteCnvDict
DataModelTestDataWriteCnv/DataModelTestDataWriteCnvDict.h
DataModelTestDataWriteCnv/selection.xml
- INCLUDE_DIRS ${ROOT_INCLUDE_DIRS}
- LINK_LIBRARIES ${ROOT_LIBRARIES} DataModelTestDataCommonLib DataModelTestDataWriteCnv
+ LINK_LIBRARIES DataModelTestDataCommonLib DataModelTestDataWriteCnv
NO_ROOTMAP_MERGE )
diff --git a/Event/EventOverlay/OverlayByteStreamAlgs/CMakeLists.txt b/Event/EventOverlay/OverlayByteStreamAlgs/CMakeLists.txt
index a4998e22dfbc5560c20110ecd403e40a8247c33f..899ed6e11c7a89212223ce2c46a448f432c2ebe3 100644
--- a/Event/EventOverlay/OverlayByteStreamAlgs/CMakeLists.txt
+++ b/Event/EventOverlay/OverlayByteStreamAlgs/CMakeLists.txt
@@ -1,24 +1,14 @@
-################################################################################
-# Package: OverlayByteStreamAlgs
-################################################################################
+# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
# Declare the package name:
atlas_subdir( OverlayByteStreamAlgs )
-# Declare the package's dependencies:
-atlas_depends_on_subdirs( PUBLIC
- GaudiKernel
- PRIVATE
- Control/AthenaBaseComps
- Control/StoreGate
- Event/ByteStreamCnvSvc
- Trigger/TrigConfiguration/TrigConfInterfaces
- Trigger/TrigEvent/TrigSteeringEvent
- Trigger/TrigT1/TrigT1Result )
+# External dependencies:
+find_package( ROOT COMPONENTS MathCore )
# Component(s) in the package:
atlas_add_component( OverlayByteStreamAlgs
src/*.cxx
src/components/*.cxx
- LINK_LIBRARIES GaudiKernel AthenaBaseComps ByteStreamCnvSvcLib StoreGateLib
- TrigSteeringEvent TrigT1Result )
+ INCLUDE_DIRS ${ROOT_INCLUDE_DIRS}
+ LINK_LIBRARIES LINK_LIBRARIES ${ROOT_LIBRARIES} AthenaBaseComps AthenaKernel ByteStreamCnvSvcLib GaudiKernel StoreGateLib TrigConfHLTData TrigConfInterfaces TrigSteeringEvent TrigT1Result )