From c7dc9ce89b1e6be9bb056aefc105a8b7747f6434 Mon Sep 17 00:00:00 2001 From: Frank Winklmeier <frank.winklmeier@cern.ch> Date: Mon, 30 Mar 2020 20:54:06 +0200 Subject: [PATCH] Switch all projects to LCG_97 Switch projects to: - LCG_97 - tdaq-09-00-00 - tdaq-common-04-00-00 --- Projects/AthDataQuality/CMakeLists.txt | 4 ++-- Projects/AthGeneration/build_externals.sh | 2 +- Projects/AthSimulation/build_externals.sh | 2 +- Projects/Athena/CMakeLists.txt | 4 ++-- Projects/Athena/build_externals.sh | 2 +- 5 files changed, 7 insertions(+), 7 deletions(-) diff --git a/Projects/AthDataQuality/CMakeLists.txt b/Projects/AthDataQuality/CMakeLists.txt index fd720da5f73..46a0abb1c81 100644 --- a/Projects/AthDataQuality/CMakeLists.txt +++ b/Projects/AthDataQuality/CMakeLists.txt @@ -8,7 +8,7 @@ project( AthDataQuality VERSION ${_version} LANGUAGES CXX ) unset( _version ) # Set the version of tdaq-common to use for the build: -set( TDAQ-COMMON_VERSION "03-04-01" CACHE STRING +set( TDAQ-COMMON_VERSION "04-00-00" CACHE STRING "The version of tdaq-common to use for the build" ) set( TDAQ-COMMON_ATROOT "$ENV{TDAQ_RELEASE_BASE}/tdaq-common/tdaq-common-${TDAQ-COMMON_VERSION}" @@ -20,7 +20,7 @@ find_package( AtlasCMake REQUIRED ) # Build the project against LCG: set( LCG_VERSION_POSTFIX "" CACHE STRING "Version postfix for the LCG release to use" ) -set( LCG_VERSION_NUMBER 96 +set( LCG_VERSION_NUMBER 97 CACHE STRING "Version number for the LCG release to use" ) find_package( LCG ${LCG_VERSION_NUMBER} EXACT REQUIRED ) diff --git a/Projects/AthGeneration/build_externals.sh b/Projects/AthGeneration/build_externals.sh index 99cf4d58cf4..012de3d5cac 100755 --- a/Projects/AthGeneration/build_externals.sh +++ b/Projects/AthGeneration/build_externals.sh @@ -24,7 +24,7 @@ BUILDDIR="" BUILDTYPE="RelWithDebInfo" FORCE="" CI="" -EXTRACMAKE=(-DLCG_VERSION_NUMBER=96 -DLCG_VERSION_POSTFIX="") +EXTRACMAKE=(-DLCG_VERSION_NUMBER=97 -DLCG_VERSION_POSTFIX="") while getopts ":t:b:x:fch" opt; do case $opt in t) diff --git a/Projects/AthSimulation/build_externals.sh b/Projects/AthSimulation/build_externals.sh index 0c4833b077a..5e3c9d5dd1c 100755 --- a/Projects/AthSimulation/build_externals.sh +++ b/Projects/AthSimulation/build_externals.sh @@ -24,7 +24,7 @@ BUILDDIR="" BUILDTYPE="RelWithDebInfo" FORCE="" CI="" -EXTRACMAKE=(-DLCG_VERSION_NUMBER=96 -DLCG_VERSION_POSTFIX="") +EXTRACMAKE=(-DLCG_VERSION_NUMBER=97 -DLCG_VERSION_POSTFIX="") while getopts ":t:b:x:fch" opt; do case $opt in t) diff --git a/Projects/Athena/CMakeLists.txt b/Projects/Athena/CMakeLists.txt index 08545f1d94d..df0ce8aef86 100644 --- a/Projects/Athena/CMakeLists.txt +++ b/Projects/Athena/CMakeLists.txt @@ -24,9 +24,9 @@ if( LCG_NIGHTLY ) set( TDAQ_VERSION "99-00-00" CACHE STRING "The version of tdaq to use for the build" ) else() - set( TDAQ-COMMON_VERSION "03-04-01" CACHE STRING + set( TDAQ-COMMON_VERSION "04-00-00" CACHE STRING "The version of tdaq-common to use for the build" ) - set( TDAQ_VERSION "08-03-01" CACHE STRING + set( TDAQ_VERSION "09-00-00" CACHE STRING "The version of tdaq to use for the build" ) endif() diff --git a/Projects/Athena/build_externals.sh b/Projects/Athena/build_externals.sh index f13334ceddd..9d3c98d6701 100755 --- a/Projects/Athena/build_externals.sh +++ b/Projects/Athena/build_externals.sh @@ -24,7 +24,7 @@ BUILDDIR="" BUILDTYPE="RelWithDebInfo" FORCE="" CI="" -EXTRACMAKE=(-DLCG_VERSION_NUMBER=96 -DLCG_VERSION_POSTFIX="") +EXTRACMAKE=(-DLCG_VERSION_NUMBER=97 -DLCG_VERSION_POSTFIX="") while getopts ":t:b:x:fch" opt; do case $opt in t) -- GitLab