From 14302444c7301eed31a72333855faa9b3ebb820c Mon Sep 17 00:00:00 2001 From: Johannes Elmsheuser <johannes.elmsheuser@cern.ch> Date: Tue, 17 Dec 2024 09:12:21 +0100 Subject: [PATCH] Update tests to LCG_106b_ATLAS_1, update ACTS and GeoModel versions --- Build/AtlasLCG/test/CMakeLists.txt | 2 +- Build/Tests/UnitTests/CMakeLists.txt | 4 ++-- External/Acts/CMakeLists.txt | 2 +- External/GeoModel/CMakeLists.txt | 2 +- Projects/AthAnalysisExternals/CMakeLists.txt | 2 +- Projects/AthDerivationExternals/CMakeLists.txt | 2 +- Projects/AthGenerationExternals/CMakeLists.txt | 2 +- Projects/AthSimulationExternals/CMakeLists.txt | 2 +- Projects/AthenaExternals/CMakeLists.txt | 2 +- Projects/VP1LightExternals/CMakeLists.txt | 2 +- 10 files changed, 11 insertions(+), 11 deletions(-) diff --git a/Build/AtlasLCG/test/CMakeLists.txt b/Build/AtlasLCG/test/CMakeLists.txt index 850e5b6f..1c31038a 100644 --- a/Build/AtlasLCG/test/CMakeLists.txt +++ b/Build/AtlasLCG/test/CMakeLists.txt @@ -17,7 +17,7 @@ string(REPLACE " " ";" _ignore "${ATLAS_LCGTEST_IGNORE}" ) # Set the version of LCG to test the code with. set( LCG_VERSION_NUMBER 106 CACHE STRING "Version number for the LCG release to test" ) -set( LCG_VERSION_POSTFIX "" CACHE STRING +set( LCG_VERSION_POSTFIX "b" CACHE STRING "Post-fix to the LCG version number" ) # Set up the LCG release. diff --git a/Build/Tests/UnitTests/CMakeLists.txt b/Build/Tests/UnitTests/CMakeLists.txt index b8d64428..32c0ea64 100644 --- a/Build/Tests/UnitTests/CMakeLists.txt +++ b/Build/Tests/UnitTests/CMakeLists.txt @@ -135,7 +135,7 @@ list( APPEND _ignore_layer ${_ignore} ) # ignore these in the full tes atlas_add_test( find_modules_lcg SCRIPT source \${ATLAS_LOCAL_ROOT_BASE}/user/atlasLocalSetup.sh && lsetup cppcheck && - ${CMAKE_COMMAND} --fresh -DLCG_VERSION_NUMBER="106" -DLCG_VERSION_POSTFIX="a" + ${CMAKE_COMMAND} --fresh -DLCG_VERSION_NUMBER="106" -DLCG_VERSION_POSTFIX="b" -DATLAS_LCGTEST_FIND_MODE=REQUIRED -DATLAS_LCGTEST_IGNORE="${_ignore}" ${CMAKE_CURRENT_SOURCE_DIR}/../../AtlasLCG/test @@ -145,7 +145,7 @@ atlas_add_test( find_modules_lcg # LCG ATLAS layer: atlas_add_test( find_modules_lcg_layer SCRIPT source \${ATLAS_LOCAL_ROOT_BASE}/user/atlasLocalSetup.sh && - ${CMAKE_COMMAND} --fresh -DLCG_VERSION_NUMBER="106" -DLCG_VERSION_POSTFIX="a_ATLAS_3" + ${CMAKE_COMMAND} --fresh -DLCG_VERSION_NUMBER="106" -DLCG_VERSION_POSTFIX="b_ATLAS_1" -DATLAS_LCGTEST_FIND_MODE=REQUIRED -DATLAS_LCGTEST_SELECT="${_select}" -DATLAS_LCGTEST_IGNORE="${_ignore_layer}" diff --git a/External/Acts/CMakeLists.txt b/External/Acts/CMakeLists.txt index 393d888a..c8093ff2 100644 --- a/External/Acts/CMakeLists.txt +++ b/External/Acts/CMakeLists.txt @@ -41,7 +41,7 @@ endif() # Declare where to get Acts from. set( ATLAS_ACTS_SOURCE - "URL;https://github.com/acts-project/acts/archive/refs/tags/v37.3.0.tar.gz;URL_HASH;SHA256=7062f00392c02ec073d0a94cf2b3598011288a5d93bf143fc59d927d8329f98e" + "URL;https://github.com/acts-project/acts/archive/refs/tags/v38.1.0.tar.gz;URL_HASH;SHA256=e85f0cfa778b39e81702d498176c144c2952311d5c89bed264942b8528095dbe" CACHE STRING "The source for Acts" ) mark_as_advanced( ATLAS_ACTS_SOURCE ) diff --git a/External/GeoModel/CMakeLists.txt b/External/GeoModel/CMakeLists.txt index d4377c58..28e38d9c 100644 --- a/External/GeoModel/CMakeLists.txt +++ b/External/GeoModel/CMakeLists.txt @@ -25,7 +25,7 @@ find_package( ZLIB ) # Declare where to get GeoModel from. set( ATLAS_GEOMODEL_SOURCE - "URL;https://gitlab.cern.ch/GeoModelDev/GeoModel/-/archive/6.6.0/GeoModel-6.6.0.tar.bz2;URL_MD5;66c32047090b20afb75cd5befefce78a" + "URL;https://gitlab.cern.ch/GeoModelDev/GeoModel/-/archive/6.7.0/GeoModel-6.7.0.tar.bz2;URL_MD5;450616aa33f97857aad3c7cbe1ff74fd" CACHE STRING "The source for GeoModel" ) mark_as_advanced( ATLAS_GEOMODEL_SOURCE ) diff --git a/Projects/AthAnalysisExternals/CMakeLists.txt b/Projects/AthAnalysisExternals/CMakeLists.txt index 14163536..8326ed8a 100644 --- a/Projects/AthAnalysisExternals/CMakeLists.txt +++ b/Projects/AthAnalysisExternals/CMakeLists.txt @@ -23,7 +23,7 @@ mark_as_advanced( AtlasCMake_DIR LCG_DIR ) find_package( AtlasCMake REQUIRED ) # Set up which LCG version to use: -set( LCG_VERSION_POSTFIX "a_ATLAS_3" +set( LCG_VERSION_POSTFIX "b_ATLAS_1" CACHE STRING "Post-fix for the LCG version number" ) set( LCG_VERSION_NUMBER 106 CACHE STRING "LCG version number to use for the project" ) diff --git a/Projects/AthDerivationExternals/CMakeLists.txt b/Projects/AthDerivationExternals/CMakeLists.txt index cf011aee..b3f16f87 100644 --- a/Projects/AthDerivationExternals/CMakeLists.txt +++ b/Projects/AthDerivationExternals/CMakeLists.txt @@ -23,7 +23,7 @@ mark_as_advanced( AtlasCMake_DIR LCG_DIR ) find_package( AtlasCMake REQUIRED ) # Set up which LCG version to use: -set( LCG_VERSION_POSTFIX "a_ATLAS_3" +set( LCG_VERSION_POSTFIX "b_ATLAS_1" CACHE STRING "Post-fix for the LCG version number" ) set( LCG_VERSION_NUMBER 106 CACHE STRING "LCG version number to use for the project" ) diff --git a/Projects/AthGenerationExternals/CMakeLists.txt b/Projects/AthGenerationExternals/CMakeLists.txt index 5f91e605..68531136 100644 --- a/Projects/AthGenerationExternals/CMakeLists.txt +++ b/Projects/AthGenerationExternals/CMakeLists.txt @@ -23,7 +23,7 @@ mark_as_advanced( AtlasCMake_DIR LCG_DIR ) find_package( AtlasCMake REQUIRED ) # Set up which LCG version to use: -set( LCG_VERSION_POSTFIX "a_ATLAS_3" +set( LCG_VERSION_POSTFIX "b_ATLAS_1" CACHE STRING "Post-fix for the LCG version number" ) set( LCG_VERSION_NUMBER 106 CACHE STRING "LCG version number to use for the project" ) diff --git a/Projects/AthSimulationExternals/CMakeLists.txt b/Projects/AthSimulationExternals/CMakeLists.txt index 1cf74d1e..f1a082e3 100644 --- a/Projects/AthSimulationExternals/CMakeLists.txt +++ b/Projects/AthSimulationExternals/CMakeLists.txt @@ -23,7 +23,7 @@ mark_as_advanced( AtlasCMake_DIR LCG_DIR ) find_package( AtlasCMake REQUIRED ) # Set up which LCG version to use: -set( LCG_VERSION_POSTFIX "a_ATLAS_3" +set( LCG_VERSION_POSTFIX "b_ATLAS_1" CACHE STRING "Post-fix for the LCG version number" ) set( LCG_VERSION_NUMBER 106 CACHE STRING "LCG version number to use for the project" ) diff --git a/Projects/AthenaExternals/CMakeLists.txt b/Projects/AthenaExternals/CMakeLists.txt index 340fed04..afd59ed7 100644 --- a/Projects/AthenaExternals/CMakeLists.txt +++ b/Projects/AthenaExternals/CMakeLists.txt @@ -28,7 +28,7 @@ mark_as_advanced( AtlasCMake_DIR LCG_DIR AtlasHIP_DIR ) find_package( AtlasCMake REQUIRED ) # Set up which LCG version to use: -set( LCG_VERSION_POSTFIX "a_ATLAS_3" +set( LCG_VERSION_POSTFIX "b_ATLAS_1" CACHE STRING "Post-fix for the LCG version number" ) set( LCG_VERSION_NUMBER 106 CACHE STRING "LCG version number to use for the project" ) diff --git a/Projects/VP1LightExternals/CMakeLists.txt b/Projects/VP1LightExternals/CMakeLists.txt index 8ca4b97e..d80f8186 100644 --- a/Projects/VP1LightExternals/CMakeLists.txt +++ b/Projects/VP1LightExternals/CMakeLists.txt @@ -26,7 +26,7 @@ mark_as_advanced( AtlasCMake_DIR LCG_DIR ) find_package( AtlasCMake REQUIRED ) # Use the LCG release if found, or only the LCG modules if not -set( LCG_VERSION_POSTFIX "a_ATLAS_3" +set( LCG_VERSION_POSTFIX "b_ATLAS_1" CACHE STRING "Post-fix for the LCG version number" ) set( LCG_VERSION_NUMBER 106 CACHE STRING "LCG version number to use for the project" ) -- GitLab