Skip to content
Snippets Groups Projects
Commit d179b8b0 authored by Frank Winklmeier's avatar Frank Winklmeier
Browse files

Merge branch 'master-CaloUtils-ref' into 'master'

CaloUtils: cmake config cleanup and fixed reference

See merge request !35310
parents 6f63a795 02aa33c6
6 merge requests!58791DataQualityConfigurations: Modify L1Calo config for web display,!46784MuonCondInterface: Enable thread-safety checking.,!46776Updated LArMonitoring config file for WD to match new files produced using MT,!45405updated ART test cron job,!42417Draft: DIRE and VINCIA Base Fragments for Pythia 8.3,!35310CaloUtils: cmake config cleanup and fixed reference
################################################################################
# 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
......
......@@ -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
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment