From 6cb55054d4d14625382b7cd165b9fb3d3e6f9c5c Mon Sep 17 00:00:00 2001
From: Frank Winklmeier <fwinkl@cern>
Date: Tue, 1 Sep 2020 18:04:01 +0200
Subject: [PATCH] EventSelectorAthenaPool: cmake cleanup
Remove `atlas_depends_on_subdirs` and update link dependencies.
---
.../EventSelectorAthenaPool/CMakeLists.txt | 28 ++++---------------
1 file changed, 5 insertions(+), 23 deletions(-)
diff --git a/Database/AthenaPOOL/EventSelectorAthenaPool/CMakeLists.txt b/Database/AthenaPOOL/EventSelectorAthenaPool/CMakeLists.txt
index 5d9257e6ba33..f903efc01ea0 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" )
--
GitLab