Skip to content
Snippets Groups Projects
Commit 741aecdf authored by Frank Winklmeier's avatar Frank Winklmeier
Browse files

AthenaPool*: cmake cleanup 

Remove `atlas_depends_on_subdirs` and update link dependencies.
parent f0ad4910
No related branches found
No related tags found
6 merge requests!58791DataQualityConfigurations: Modify L1Calo config for web display,!46784MuonCondInterface: Enable thread-safety checking.,!46776Updated LArMonitoring config file for WD to match new files produced using MT,!45405updated ART test cron job,!42417Draft: DIRE and VINCIA Base Fragments for Pythia 8.3,!36075AthenaPOOL: cmake cleanup
Hide whitespace changes
Inline Side-by-side
Database/AthenaPOOL/AthenaPoolCnvSvc/CMakeLists.txt
+ 11
− 44
View file @ 741aecdf
# $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 )
......
Database/AthenaPOOL/AthenaPoolServices/CMakeLists.txt
+ 1
− 10
View file @ 741aecdf
......@@ -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 )
Database/AthenaPOOL/AthenaPoolTools/CMakeLists.txt
+ 2
− 16
View file @ 741aecdf
################################################################################
# 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 )
......
Database/AthenaPOOL/AthenaPoolUtilities/CMakeLists.txt
+ 2
− 15
View file @ 741aecdf
# $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
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment