From c9ca3d3238e7208f5a5a206ccc99e330ab00dbc7 Mon Sep 17 00:00:00 2001
From: Frank Winklmeier <frank.winklmeier@cern.ch>
Date: Wed, 29 Jul 2020 15:42:45 +0000
Subject: [PATCH] Event/ByteStream*: cmake cleanup
- remove atlas_depends_on_subdirs
- update some link dependencies
---
Event/ByteStreamCnvSvc/CMakeLists.txt | 25 +----------------
.../ATLAS_CHECK_THREAD_SAFETY | 1 +
Event/ByteStreamCnvSvcBase/CMakeLists.txt | 28 ++++---------------
Event/ByteStreamCnvSvcLegacy/CMakeLists.txt | 5 +---
.../ByteStreamData/ATLAS_CHECK_THREAD_SAFETY | 1 +
Event/ByteStreamData/CMakeLists.txt | 11 +-------
.../ATLAS_CHECK_THREAD_SAFETY | 1 +
.../ByteStreamEventAthenaPool/CMakeLists.txt | 12 +-------
.../ATLAS_CHECK_THREAD_SAFETY | 1 +
Event/ByteStreamEventPTCnv/CMakeLists.txt | 18 ++----------
.../ATLAS_CHECK_THREAD_SAFETY | 1 +
Event/ByteStreamEventTPCnv/CMakeLists.txt | 22 +++------------
.../ATLAS_CHECK_THREAD_SAFETY | 1 +
Event/ByteStreamStoragePlugins/CMakeLists.txt | 4 +--
Event/ByteStreamTest/CMakeLists.txt | 17 +----------
15 files changed, 25 insertions(+), 123 deletions(-)
create mode 100644 Event/ByteStreamCnvSvcBase/ByteStreamCnvSvcBase/ATLAS_CHECK_THREAD_SAFETY
create mode 100644 Event/ByteStreamData/ByteStreamData/ATLAS_CHECK_THREAD_SAFETY
create mode 100644 Event/ByteStreamEventAthenaPool/ATLAS_CHECK_THREAD_SAFETY
create mode 100644 Event/ByteStreamEventPTCnv/ByteStreamEventPTCnv/ATLAS_CHECK_THREAD_SAFETY
create mode 100644 Event/ByteStreamEventTPCnv/ByteStreamEventTPCnv/ATLAS_CHECK_THREAD_SAFETY
create mode 100644 Event/ByteStreamStoragePlugins/ATLAS_CHECK_THREAD_SAFETY
diff --git a/Event/ByteStreamCnvSvc/CMakeLists.txt b/Event/ByteStreamCnvSvc/CMakeLists.txt
index 0a9a8bc4cfc..7ebfa49d91c 100644
--- a/Event/ByteStreamCnvSvc/CMakeLists.txt
+++ b/Event/ByteStreamCnvSvc/CMakeLists.txt
@@ -1,30 +1,8 @@
-################################################################################
-# Package: ByteStreamCnvSvc
-################################################################################
+# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
# Declare the package name:
atlas_subdir( ByteStreamCnvSvc )
-# Declare the package's dependencies:
-atlas_depends_on_subdirs(
- PUBLIC
- Control/AthenaBaseComps
- Event/ByteStreamCnvSvcBase
- Event/ByteStreamData
- GaudiKernel
- PRIVATE
- Control/AthenaKernel
- Control/SGTools
- Control/StoreGate
- Database/APR/CollectionBase
- Database/APR/FileCatalog
- Database/AthenaPOOL/AthenaPoolUtilities
- Database/PersistentDataModel
- Event/EventInfo
- Event/xAOD/xAODEventInfo
- Event/xAOD/xAODTrigger
- Event/ByteStreamCnvSvcLegacy )
-
# External dependencies:
find_package( Boost COMPONENTS system )
find_package( CORAL COMPONENTS CoralBase )
@@ -62,7 +40,6 @@ atlas_add_executable( AtlListBSEvents test/AtlListBSEvents.cxx
INCLUDE_DIRS ${TDAQ-COMMON_INCLUDE_DIRS} ${Boost_INCLUDE_DIRS}
LINK_LIBRARIES ${TDAQ-COMMON_LIBRARIES} ${Boost_LIBRARIES} )
-
# Test(s) in the package:
atlas_add_test( BSEventSelector
SCRIPT "athena.py ByteStreamCnvSvc/BSEventSelector_test_jobOptions.py"
diff --git a/Event/ByteStreamCnvSvcBase/ByteStreamCnvSvcBase/ATLAS_CHECK_THREAD_SAFETY b/Event/ByteStreamCnvSvcBase/ByteStreamCnvSvcBase/ATLAS_CHECK_THREAD_SAFETY
new file mode 100644
index 00000000000..a52a59a2d4d
--- /dev/null
+++ b/Event/ByteStreamCnvSvcBase/ByteStreamCnvSvcBase/ATLAS_CHECK_THREAD_SAFETY
@@ -0,0 +1 @@
+Event/ByteStreamCnvSvcBase
diff --git a/Event/ByteStreamCnvSvcBase/CMakeLists.txt b/Event/ByteStreamCnvSvcBase/CMakeLists.txt
index cec0ade0db7..b51e5a18b1c 100644
--- a/Event/ByteStreamCnvSvcBase/CMakeLists.txt
+++ b/Event/ByteStreamCnvSvcBase/CMakeLists.txt
@@ -1,21 +1,8 @@
-################################################################################
-# Package: ByteStreamCnvSvcBase
-################################################################################
+# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
# Declare the package name:
atlas_subdir( ByteStreamCnvSvcBase )
-# Declare the package's dependencies:
-atlas_depends_on_subdirs( PUBLIC
- Control/AthenaBaseComps
- Control/AthenaKernel
- Control/StoreGate
- Event/ByteStreamData
- GaudiKernel
- PRIVATE
- Control/SGTools
- AtlasTest/TestTools )
-
# External dependencies:
find_package( tdaq-common COMPONENTS eformat eformat_write )
@@ -29,15 +16,12 @@ atlas_add_library( ByteStreamCnvSvcBaseLib
atlas_add_component( ByteStreamCnvSvcBase
src/components/*.cxx
- INCLUDE_DIRS ${TDAQ-COMMON_INCLUDE_DIRS}
- LINK_LIBRARIES ${TDAQ-COMMON_LIBRARIES} AthenaBaseComps AthenaKernel StoreGateLib SGtests ByteStreamData ByteStreamData_test GaudiKernel SGTools ByteStreamCnvSvcBaseLib )
-
-
-atlas_add_test( ROBDataProviderSvcMT
- SCRIPT test/test_ROBDataProviderSvcMT.sh
- PROPERTIES TIMEOUT 1200 )
-#
+ LINK_LIBRARIES ByteStreamCnvSvcBaseLib )
# Install files from the package:
atlas_install_joboptions( share/*.py )
+# Tests in the package:
+atlas_add_test( ROBDataProviderSvcMT
+ SCRIPT test/test_ROBDataProviderSvcMT.sh
+ PROPERTIES TIMEOUT 1200 )
diff --git a/Event/ByteStreamCnvSvcLegacy/CMakeLists.txt b/Event/ByteStreamCnvSvcLegacy/CMakeLists.txt
index 7561b31f5bf..775000f22bb 100644
--- a/Event/ByteStreamCnvSvcLegacy/CMakeLists.txt
+++ b/Event/ByteStreamCnvSvcLegacy/CMakeLists.txt
@@ -1,7 +1,4 @@
-# $Id: CMakeLists.txt 756859 2016-06-22 10:53:03Z krasznaa $
-################################################################################
-# Package: ByteStreamCnvSvcLegacy
-################################################################################
+# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
# Declare the package name:
atlas_subdir( ByteStreamCnvSvcLegacy )
diff --git a/Event/ByteStreamData/ByteStreamData/ATLAS_CHECK_THREAD_SAFETY b/Event/ByteStreamData/ByteStreamData/ATLAS_CHECK_THREAD_SAFETY
new file mode 100644
index 00000000000..797ff54a093
--- /dev/null
+++ b/Event/ByteStreamData/ByteStreamData/ATLAS_CHECK_THREAD_SAFETY
@@ -0,0 +1 @@
+Event/ByteStreamData
diff --git a/Event/ByteStreamData/CMakeLists.txt b/Event/ByteStreamData/CMakeLists.txt
index 4b0fb94f8f2..1f8554f05be 100644
--- a/Event/ByteStreamData/CMakeLists.txt
+++ b/Event/ByteStreamData/CMakeLists.txt
@@ -1,17 +1,8 @@
-# $Id: CMakeLists.txt 782284 2016-11-04 08:07:16Z krasznaa $
-################################################################################
-# Package: ByteStreamData
-################################################################################
+# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
# Declare the package name:
atlas_subdir( ByteStreamData )
-# Declare the package's dependencies:
-atlas_depends_on_subdirs(
- PUBLIC
- Control/AthenaKernel
- Control/AthContainers )
-
# External dependencies:
find_package( tdaq-common COMPONENTS DataReader )
diff --git a/Event/ByteStreamEventAthenaPool/ATLAS_CHECK_THREAD_SAFETY b/Event/ByteStreamEventAthenaPool/ATLAS_CHECK_THREAD_SAFETY
new file mode 100644
index 00000000000..355444cf82c
--- /dev/null
+++ b/Event/ByteStreamEventAthenaPool/ATLAS_CHECK_THREAD_SAFETY
@@ -0,0 +1 @@
+Event/ByteStreamEventAthenaPool
diff --git a/Event/ByteStreamEventAthenaPool/CMakeLists.txt b/Event/ByteStreamEventAthenaPool/CMakeLists.txt
index 1e93fa1d651..43aba7ba3d2 100644
--- a/Event/ByteStreamEventAthenaPool/CMakeLists.txt
+++ b/Event/ByteStreamEventAthenaPool/CMakeLists.txt
@@ -1,18 +1,8 @@
-################################################################################
-# Package: ByteStreamEventAthenaPool
-################################################################################
+# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
# Declare the package name:
atlas_subdir( ByteStreamEventAthenaPool )
-# Declare the package's dependencies:
-atlas_depends_on_subdirs( PUBLIC
- Database/AthenaPOOL/AthenaPoolUtilities
- PRIVATE
- Database/AthenaPOOL/AthenaPoolCnvSvc
- Event/ByteStreamData
- Event/ByteStreamEventTPCnv )
-
# Component(s) in the package:
atlas_add_poolcnv_library( ByteStreamEventAthenaPoolPoolCnv
src/*.cxx
diff --git a/Event/ByteStreamEventPTCnv/ByteStreamEventPTCnv/ATLAS_CHECK_THREAD_SAFETY b/Event/ByteStreamEventPTCnv/ByteStreamEventPTCnv/ATLAS_CHECK_THREAD_SAFETY
new file mode 100644
index 00000000000..7d0bf8761b3
--- /dev/null
+++ b/Event/ByteStreamEventPTCnv/ByteStreamEventPTCnv/ATLAS_CHECK_THREAD_SAFETY
@@ -0,0 +1 @@
+Event/ByteStreamEventPTCnv
diff --git a/Event/ByteStreamEventPTCnv/CMakeLists.txt b/Event/ByteStreamEventPTCnv/CMakeLists.txt
index 4c1839c2daa..a564ac45180 100644
--- a/Event/ByteStreamEventPTCnv/CMakeLists.txt
+++ b/Event/ByteStreamEventPTCnv/CMakeLists.txt
@@ -1,27 +1,15 @@
-################################################################################
-# Package: ByteStreamEventPTCnv
-################################################################################
+# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
# Declare the package name:
atlas_subdir( ByteStreamEventPTCnv )
-# Declare the package's dependencies:
-atlas_depends_on_subdirs( PUBLIC
- Event/ByteStreamEventTPCnv )
-
-# External dependencies:
-find_package( ROOT COMPONENTS Core Tree MathCore Hist RIO pthread )
-
# Component(s) in the package:
atlas_add_tpcnv_library( ByteStreamEventPTCnv
src/*.cxx
PUBLIC_HEADERS ByteStreamEventPTCnv
- PRIVATE_INCLUDE_DIRS ${ROOT_INCLUDE_DIRS}
- LINK_LIBRARIES ${ROOT_LIBRARIES} ByteStreamEventTPCnv )
+ LINK_LIBRARIES ByteStreamEventTPCnv )
atlas_add_dictionary( ByteStreamEventPTCnvDict
ByteStreamEventPTCnv/ByteStreamEventPTCnvDict.h
ByteStreamEventPTCnv/selection.xml
- INCLUDE_DIRS ${ROOT_INCLUDE_DIRS}
- LINK_LIBRARIES ${ROOT_LIBRARIES} ByteStreamEventTPCnv ByteStreamEventPTCnv )
-
+ LINK_LIBRARIES ByteStreamEventPTCnv )
diff --git a/Event/ByteStreamEventTPCnv/ByteStreamEventTPCnv/ATLAS_CHECK_THREAD_SAFETY b/Event/ByteStreamEventTPCnv/ByteStreamEventTPCnv/ATLAS_CHECK_THREAD_SAFETY
new file mode 100644
index 00000000000..12c42e54706
--- /dev/null
+++ b/Event/ByteStreamEventTPCnv/ByteStreamEventTPCnv/ATLAS_CHECK_THREAD_SAFETY
@@ -0,0 +1 @@
+Event/ByteStreamEventTPCnv
diff --git a/Event/ByteStreamEventTPCnv/CMakeLists.txt b/Event/ByteStreamEventTPCnv/CMakeLists.txt
index 22ff43f590d..7f569b61c52 100644
--- a/Event/ByteStreamEventTPCnv/CMakeLists.txt
+++ b/Event/ByteStreamEventTPCnv/CMakeLists.txt
@@ -1,34 +1,20 @@
-################################################################################
-# Package: ByteStreamEventTPCnv
-################################################################################
+# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
# Declare the package name:
atlas_subdir( ByteStreamEventTPCnv )
-# Declare the package's dependencies:
-atlas_depends_on_subdirs( PUBLIC
- Database/AthenaPOOL/AthenaPoolCnvSvc
- Event/ByteStreamData )
-
-# External dependencies:
-find_package( ROOT COMPONENTS Core Tree MathCore Hist RIO pthread )
-
# Component(s) in the package:
atlas_add_tpcnv_library( ByteStreamEventTPCnv
src/*.cxx
PUBLIC_HEADERS ByteStreamEventTPCnv
- INCLUDE_DIRS ${ROOT_INCLUDE_DIRS}
- LINK_LIBRARIES ${ROOT_LIBRARIES} AthenaPoolCnvSvcLib ByteStreamData ByteStreamData_test )
+ LINK_LIBRARIES AthenaPoolCnvSvcLib ByteStreamData )
atlas_add_dictionary( ByteStreamEventTPCnvDict
ByteStreamEventTPCnv/ByteStreamEventTPCnvDict.h
ByteStreamEventTPCnv/selection.xml
- INCLUDE_DIRS ${ROOT_INCLUDE_DIRS}
- LINK_LIBRARIES ${ROOT_LIBRARIES} AthenaPoolCnvSvcLib ByteStreamData ByteStreamData_test ByteStreamEventTPCnv )
+ LINK_LIBRARIES ByteStreamEventTPCnv )
atlas_add_dictionary( OLD_ByteStreamEventTPCnvDict
ByteStreamEventTPCnv/ByteStreamEventTPCnvDict.h
ByteStreamEventTPCnv/OLD_selection.xml
- INCLUDE_DIRS ${ROOT_INCLUDE_DIRS}
- LINK_LIBRARIES ${ROOT_LIBRARIES} AthenaPoolCnvSvcLib ByteStreamData ByteStreamData_test ByteStreamEventTPCnv )
-
+ LINK_LIBRARIES ByteStreamEventTPCnv )
diff --git a/Event/ByteStreamStoragePlugins/ATLAS_CHECK_THREAD_SAFETY b/Event/ByteStreamStoragePlugins/ATLAS_CHECK_THREAD_SAFETY
new file mode 100644
index 00000000000..533126bc27a
--- /dev/null
+++ b/Event/ByteStreamStoragePlugins/ATLAS_CHECK_THREAD_SAFETY
@@ -0,0 +1 @@
+Event/ByteStreamStoragePlugins
diff --git a/Event/ByteStreamStoragePlugins/CMakeLists.txt b/Event/ByteStreamStoragePlugins/CMakeLists.txt
index 12c18db67f0..61811b70e08 100644
--- a/Event/ByteStreamStoragePlugins/CMakeLists.txt
+++ b/Event/ByteStreamStoragePlugins/CMakeLists.txt
@@ -1,6 +1,4 @@
-################################################################################
-# Package: ByteStreamStoragePlugins
-################################################################################
+# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
# Declare the package name:
atlas_subdir( ByteStreamStoragePlugins )
diff --git a/Event/ByteStreamTest/CMakeLists.txt b/Event/ByteStreamTest/CMakeLists.txt
index 4e6b4f54509..77ab2ace114 100644
--- a/Event/ByteStreamTest/CMakeLists.txt
+++ b/Event/ByteStreamTest/CMakeLists.txt
@@ -1,21 +1,8 @@
-################################################################################
-# Package: ByteStreamTest
-################################################################################
+# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
# Declare the package name:
atlas_subdir( ByteStreamTest )
-# Declare the package's dependencies:
-atlas_depends_on_subdirs( PUBLIC
- Control/MinimalRunTime
- PRIVATE
- Control/AthenaBaseComps
- Control/AthenaKernel
- Database/AthenaPOOL/AthenaPoolUtilities
- Event/ByteStreamCnvSvc
- Event/ByteStreamData
- GaudiKernel )
-
# Component(s) in the package:
atlas_add_component( ByteStreamTest
src/EvenEventsSelectorTool.cxx
@@ -25,7 +12,6 @@ atlas_add_component( ByteStreamTest
# Install files from the package:
atlas_install_joboptions( share/*.py )
-
function (bytestreamtest_run_test jo)
cmake_parse_arguments( ARG "" "DEPENDS" "" ${ARGN} )
@@ -42,7 +28,6 @@ function (bytestreamtest_run_test jo)
endif()
endfunction (bytestreamtest_run_test)
-
#bytestreamtest_run_test( SkipAll )
bytestreamtest_run_test( SkipOne )
bytestreamtest_run_test( SkipNone )
--
GitLab