From 2b7856ef70248944e3dbad9a939e5e6578bb1ca2 Mon Sep 17 00:00:00 2001
From: Attila Krasznahorkay <Attila.Krasznahorkay@cern.ch>
Date: Wed, 25 Mar 2020 16:37:05 +0100
Subject: [PATCH] Updated the LAr POOL converter packages not to set
AthenaPoolUtilitiesTest_DIR.
That variable will be set on the project level in the future, the packages
should not bother setting it themselves.
---
.../LArCnv/LArAthenaPool/CMakeLists.txt | 38 ++++++-------------
.../LArSimEventAthenaPool/CMakeLists.txt | 31 ++++-----------
2 files changed, 19 insertions(+), 50 deletions(-)
diff --git a/LArCalorimeter/LArCnv/LArAthenaPool/CMakeLists.txt b/LArCalorimeter/LArCnv/LArAthenaPool/CMakeLists.txt
index 15e8aac8491..5944a121ce5 100644
--- a/LArCalorimeter/LArCnv/LArAthenaPool/CMakeLists.txt
+++ b/LArCalorimeter/LArCnv/LArAthenaPool/CMakeLists.txt
@@ -1,44 +1,28 @@
-################################################################################
-# Package: LArAthenaPool
-################################################################################
+# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
# Declare the package name:
atlas_subdir( LArAthenaPool )
-# Declare the package's dependencies:
-atlas_depends_on_subdirs( PUBLIC
- Database/AthenaPOOL/AthenaPoolUtilities
- Database/AtlasSealCLHEP
- PRIVATE
- AtlasTest/TestTools
- Calorimeter/CaloDetDescr
- Control/AthenaKernel
- Control/StoreGate
- Database/AthenaPOOL/AthenaPoolCnvSvc
- GaudiKernel
- LArCalorimeter/LArCnv/LArTPCnv
- LArCalorimeter/LArRawEvent
- LArCalorimeter/LArRecEvent )
-
# Component(s) in the package:
atlas_add_poolcnv_library( LArAthenaPoolPoolCnv
- src/*.cxx
- FILES LArRawEvent/LArRawChannelContainer.h LArRawEvent/LArDigitContainer.h LArRawEvent/LArTTL1Container.h LArRawEvent/LArFebErrorSummary.h LArRecEvent/LArNoisyROSummary.h
- LINK_LIBRARIES AthenaPoolUtilities CaloDetDescrLib AthenaKernel StoreGateLib SGtests AthenaPoolCnvSvcLib GaudiKernel LArTPCnv LArRawEvent LArRecEvent )
+ src/*.h src/*.cxx
+ FILES LArRawEvent/LArRawChannelContainer.h LArRawEvent/LArDigitContainer.h
+ LArRawEvent/LArTTL1Container.h LArRawEvent/LArFebErrorSummary.h
+ LArRecEvent/LArNoisyROSummary.h
+ LINK_LIBRARIES AthenaPoolUtilities CaloDetDescrLib AthenaKernel StoreGateLib
+ AthenaPoolCnvSvcLib GaudiKernel LArTPCnv LArRawEvent
+ LArRecEvent )
# Install files from the package:
atlas_install_joboptions( share/*.py )
# Set up (a) test(s) for the converter(s):
-if( IS_DIRECTORY ${CMAKE_SOURCE_DIR}/Database/AthenaPOOL/AthenaPoolUtilities )
- set( AthenaPoolUtilitiesTest_DIR
- ${CMAKE_SOURCE_DIR}/Database/AthenaPOOL/AthenaPoolUtilities/cmake )
-endif()
find_package( AthenaPoolUtilitiesTest )
if( ATHENAPOOLUTILITIESTEST_FOUND )
run_tpcnv_legacy_test( LArTPCnv_15.6.7 ESD-15.6.7-data )
run_tpcnv_legacy_test( LArTPCnv_20.1.7.2 ESD-20.1.7.2 )
else()
- message( WARNING "Couldn't find AthenaPoolUtilitiesTest. No test(s) set up." )
-endif()
+ message( WARNING
+ "Couldn't find AthenaPoolUtilitiesTest. No test(s) set up." )
+endif()
diff --git a/LArCalorimeter/LArCnv/LArSimEventAthenaPool/CMakeLists.txt b/LArCalorimeter/LArCnv/LArSimEventAthenaPool/CMakeLists.txt
index 6c65d435993..d6ca634f615 100644
--- a/LArCalorimeter/LArCnv/LArSimEventAthenaPool/CMakeLists.txt
+++ b/LArCalorimeter/LArCnv/LArSimEventAthenaPool/CMakeLists.txt
@@ -1,35 +1,19 @@
-################################################################################
-# Package: LArSimEventAthenaPool
-################################################################################
+# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
# Declare the package name:
atlas_subdir( LArSimEventAthenaPool )
-# Declare the package's dependencies:
-atlas_depends_on_subdirs( PUBLIC
- Database/AthenaPOOL/AthenaPoolUtilities
- Database/AtlasSealCLHEP
- PRIVATE
- AtlasTest/TestTools
- Database/AthenaPOOL/AthenaPoolCnvSvc
- GaudiKernel
- LArCalorimeter/LArCnv/LArSimEventTPCnv
- LArCalorimeter/LArSimEvent )
-
# Component(s) in the package:
atlas_add_poolcnv_library( LArSimEventAthenaPoolPoolCnv
- src/*.cxx
- FILES LArSimEvent/LArHitContainer.h LArSimEvent/LArHitFloatContainer.h
- LINK_LIBRARIES AthenaPoolUtilities AthenaPoolCnvSvcLib GaudiKernel LArSimEventTPCnv LArSimEvent )
+ src/*.h src/*.cxx
+ FILES LArSimEvent/LArHitContainer.h LArSimEvent/LArHitFloatContainer.h
+ LINK_LIBRARIES AthenaPoolUtilities AthenaPoolCnvSvcLib GaudiKernel
+ LArSimEventTPCnv LArSimEvent )
# Install files from the package:
atlas_install_joboptions( share/*.py )
# Set up (a) test(s) for the converter(s):
-if( IS_DIRECTORY ${CMAKE_SOURCE_DIR}/Database/AthenaPOOL/AthenaPoolUtilities )
- set( AthenaPoolUtilitiesTest_DIR
- ${CMAKE_SOURCE_DIR}/Database/AthenaPOOL/AthenaPoolUtilities/cmake )
-endif()
find_package( AthenaPoolUtilitiesTest )
if( ATHENAPOOLUTILITIESTEST_FOUND )
@@ -38,5 +22,6 @@ if( ATHENAPOOLUTILITIESTEST_FOUND )
run_tpcnv_legacy_test( LArSimEventTPCnv_HITS HITS.04919495._000416
REFERENCE_TAG ${LARSIMEVENTATHENAPOOL_REFERENCE_TAG} )
else()
- message( WARNING "Couldn't find AthenaPoolUtilitiesTest. No test(s) set up." )
-endif()
+ message( WARNING
+ "Couldn't find AthenaPoolUtilitiesTest. No test(s) set up." )
+endif()
--
GitLab