Skip to content
Snippets Groups Projects
Commit 2b7856ef authored by Attila Krasznahorkay's avatar Attila Krasznahorkay
Browse files

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.
parent 06e74c92
No related branches found
No related tags found
No related merge requests found
################################################################################ # Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
# Package: LArAthenaPool
################################################################################
# Declare the package name: # Declare the package name:
atlas_subdir( LArAthenaPool ) 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: # Component(s) in the package:
atlas_add_poolcnv_library( LArAthenaPoolPoolCnv atlas_add_poolcnv_library( LArAthenaPoolPoolCnv
src/*.cxx src/*.h src/*.cxx
FILES LArRawEvent/LArRawChannelContainer.h LArRawEvent/LArDigitContainer.h LArRawEvent/LArTTL1Container.h LArRawEvent/LArFebErrorSummary.h LArRecEvent/LArNoisyROSummary.h FILES LArRawEvent/LArRawChannelContainer.h LArRawEvent/LArDigitContainer.h
LINK_LIBRARIES AthenaPoolUtilities CaloDetDescrLib AthenaKernel StoreGateLib SGtests AthenaPoolCnvSvcLib GaudiKernel LArTPCnv LArRawEvent LArRecEvent ) 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: # Install files from the package:
atlas_install_joboptions( share/*.py ) atlas_install_joboptions( share/*.py )
# Set up (a) test(s) for the converter(s): # 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 ) find_package( AthenaPoolUtilitiesTest )
if( ATHENAPOOLUTILITIESTEST_FOUND ) if( ATHENAPOOLUTILITIESTEST_FOUND )
run_tpcnv_legacy_test( LArTPCnv_15.6.7 ESD-15.6.7-data ) 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 ) run_tpcnv_legacy_test( LArTPCnv_20.1.7.2 ESD-20.1.7.2 )
else() else()
message( WARNING "Couldn't find AthenaPoolUtilitiesTest. No test(s) set up." ) message( WARNING
endif() "Couldn't find AthenaPoolUtilitiesTest. No test(s) set up." )
endif()
################################################################################ # Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
# Package: LArSimEventAthenaPool
################################################################################
# Declare the package name: # Declare the package name:
atlas_subdir( LArSimEventAthenaPool ) 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: # Component(s) in the package:
atlas_add_poolcnv_library( LArSimEventAthenaPoolPoolCnv atlas_add_poolcnv_library( LArSimEventAthenaPoolPoolCnv
src/*.cxx src/*.h src/*.cxx
FILES LArSimEvent/LArHitContainer.h LArSimEvent/LArHitFloatContainer.h FILES LArSimEvent/LArHitContainer.h LArSimEvent/LArHitFloatContainer.h
LINK_LIBRARIES AthenaPoolUtilities AthenaPoolCnvSvcLib GaudiKernel LArSimEventTPCnv LArSimEvent ) LINK_LIBRARIES AthenaPoolUtilities AthenaPoolCnvSvcLib GaudiKernel
LArSimEventTPCnv LArSimEvent )
# Install files from the package: # Install files from the package:
atlas_install_joboptions( share/*.py ) atlas_install_joboptions( share/*.py )
# Set up (a) test(s) for the converter(s): # 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 ) find_package( AthenaPoolUtilitiesTest )
if( ATHENAPOOLUTILITIESTEST_FOUND ) if( ATHENAPOOLUTILITIESTEST_FOUND )
...@@ -38,5 +22,6 @@ if( ATHENAPOOLUTILITIESTEST_FOUND ) ...@@ -38,5 +22,6 @@ if( ATHENAPOOLUTILITIESTEST_FOUND )
run_tpcnv_legacy_test( LArSimEventTPCnv_HITS HITS.04919495._000416 run_tpcnv_legacy_test( LArSimEventTPCnv_HITS HITS.04919495._000416
REFERENCE_TAG ${LARSIMEVENTATHENAPOOL_REFERENCE_TAG} ) REFERENCE_TAG ${LARSIMEVENTATHENAPOOL_REFERENCE_TAG} )
else() else()
message( WARNING "Couldn't find AthenaPoolUtilitiesTest. No test(s) set up." ) message( WARNING
endif() "Couldn't find AthenaPoolUtilitiesTest. No test(s) set up." )
endif()
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