From 02aa33c6289264c247422f44cb78f8872a0faa78 Mon Sep 17 00:00:00 2001
From: Vakho Tsulaia <vakhtang.tsulaia@cern.ch>
Date: Sat, 1 Aug 2020 23:54:21 +0200
Subject: [PATCH] CaloUtils: cmake config cleanup and fixed reference
Dropped atlas_depends_on_subdirs() from CMakeLists.txt, and fixed one ref file
---
Calorimeter/CaloUtils/CMakeLists.txt | 31 ++-----------------
.../CaloUtils/share/CaloTowerStore_test.ref | 1 -
2 files changed, 2 insertions(+), 30 deletions(-)
diff --git a/Calorimeter/CaloUtils/CMakeLists.txt b/Calorimeter/CaloUtils/CMakeLists.txt
index 2f5116be2162..3dfcd9b94bcd 100644
--- a/Calorimeter/CaloUtils/CMakeLists.txt
+++ b/Calorimeter/CaloUtils/CMakeLists.txt
@@ -1,35 +1,8 @@
-################################################################################
-# Package: CaloUtils
-################################################################################
+#Copyright (C) 2020 CERN for the benefit of the ATLAS collaboration
# Declare the package name:
atlas_subdir( CaloUtils )
-# Declare the package's dependencies:
-atlas_depends_on_subdirs(
- PUBLIC
- Calorimeter/CaloConditions
- Calorimeter/CaloDetDescr
- Calorimeter/CaloEvent
- Calorimeter/CaloGeoHelpers
- Calorimeter/CaloIdentifier
- Calorimeter/CaloInterface
- Control/AthenaBaseComps
- Control/AthenaKernel
- Control/Navigation
- Control/StoreGate
- Control/CxxUtils
- Event/FourMom
- Event/xAOD/xAODCaloEvent
- Event/xAOD/xAODCore
- GaudiKernel
- PRIVATE
- AtlasTest/TestTools
- Control/SGTools
- DetectorDescription/GeoModel/GeoModelInterfaces
- DetectorDescription/IdDictParser
- DetectorDescription/Identifier )
-
# External dependencies:
find_package( Boost )
find_package( CLHEP )
@@ -93,7 +66,7 @@ atlas_add_test( CaloTowerStore_test
atlas_add_test( CaloTowerBuilderTool_test
SCRIPT test/CaloTowerBuilderTool_test.sh
LOG_IGNORE_PATTERN "Reading file|Unable to locate catalog|Cache alignment"
- ENVIRONMENT "ATLAS_REFERENCE_TAG=CaloUtils/CaloUtils-01-00-11"
+ ENVIRONMENT "ATLAS_REFERENCE_TAG=CaloUtils/CaloUtils-01-00-12"
PROPERTIES TIMEOUT 500 )
atlas_add_test( ToolWithConstants_test
diff --git a/Calorimeter/CaloUtils/share/CaloTowerStore_test.ref b/Calorimeter/CaloUtils/share/CaloTowerStore_test.ref
index 934c2aa895b8..e1a355baef8b 100644
--- a/Calorimeter/CaloUtils/share/CaloTowerStore_test.ref
+++ b/Calorimeter/CaloUtils/share/CaloTowerStore_test.ref
@@ -31,7 +31,6 @@ StatusCodeSvc INFO initialize
AthDictLoaderSvc INFO in initialize...
AthDictLoaderSvc INFO acquired Dso-registry
ClassIDSvc INFO getRegistryEntries: read 3542 CLIDRegistry entries for module ALL
-CoreDumpSvc INFO install f-a-t-a-l handler... (flag = -1)
CoreDumpSvc INFO Handling signals: 11(Segmentation fault) 7(Bus error) 4(Illegal instruction) 8(Floating point exception)
MetaDataSvc INFO Initializing MetaDataSvc - package version AthenaServices-00-00-00
AthenaPoolCnvSvc INFO Initializing AthenaPoolCnvSvc - package version AthenaPoolCnvSvc-00-00-00
--
GitLab