From 3ff6d80e15f8018f183596ab443c192d4b998c77 Mon Sep 17 00:00:00 2001 From: Frank Winklmeier <fwinkl@cern> Date: Fri, 28 Aug 2020 13:49:33 +0200 Subject: [PATCH] EventContainers: cmake cleanup Remove atlas_depends_on_subdirs and update link dependencies. --- Event/EventContainers/CMakeLists.txt | 29 +++++++++------------------- 1 file changed, 9 insertions(+), 20 deletions(-) diff --git a/Event/EventContainers/CMakeLists.txt b/Event/EventContainers/CMakeLists.txt index 13966852d9b..18f750101be 100644 --- a/Event/EventContainers/CMakeLists.txt +++ b/Event/EventContainers/CMakeLists.txt @@ -1,52 +1,41 @@ -################################################################################ -# Package: EventContainers -################################################################################ +# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration # Declare the package name: atlas_subdir( EventContainers ) -# Declare the package's dependencies: -atlas_depends_on_subdirs( PUBLIC - DetectorDescription/Identifier - GaudiKernel - PRIVATE - Control/AthenaKernel ) - -# Install files from the package: - +# Component(s) in the package: atlas_add_library( EventContainers src/*.cxx PUBLIC_HEADERS EventContainers - LINK_LIBRARIES AthenaKernel Identifier GaudiKernel ) - + LINK_LIBRARIES AthenaKernel CxxUtils GaudiKernel Identifier ) atlas_add_dictionary( EventContainersDict EventContainers/EventContainersDict.h EventContainers/selection.xml LINK_LIBRARIES EventContainers ) - +# Tests in the package: atlas_add_test( IdCont SOURCES test/ID_ContainerTest.cxx INCLUDE_DIRS src test EventContainers - LINK_LIBRARIES Identifier AthenaKernel GaudiKernel EventContainers + LINK_LIBRARIES EventContainers LOG_IGNORE_PATTERN "elapsed" ) atlas_add_test( IdMTCont SOURCES test/IDMT_ContainerTest.cxx INCLUDE_DIRS src test EventContainers - LINK_LIBRARIES Identifier AthenaKernel GaudiKernel EventContainers + LINK_LIBRARIES EventContainers LOG_IGNORE_PATTERN "elapsed" ) atlas_add_test( IDStressTest SOURCES test/IDC_Realistic_Test.cxx INCLUDE_DIRS src test EventContainers - LINK_LIBRARIES Identifier AthenaKernel GaudiKernel EventContainers + LINK_LIBRARIES EventContainers LOG_IGNORE_PATTERN "elapsed|^no lock time|^deleted|^countHit|^lock time" ) atlas_add_test( IDCValueTest SOURCES test/IDCValueTest.cxx INCLUDE_DIRS src test EventContainers - LINK_LIBRARIES Identifier AthenaKernel GaudiKernel EventContainers + LINK_LIBRARIES EventContainers ) atlas_add_test( IDBenchTest SOURCES test/IDC_Benchmark.cxx INCLUDE_DIRS src test EventContainers - LINK_LIBRARIES Identifier AthenaKernel GaudiKernel EventContainers + LINK_LIBRARIES EventContainers LOG_IGNORE_PATTERN "time" ) -- GitLab