Skip to content
Snippets Groups Projects
Commit aea1a959 authored by Vakhtang Tsulaia's avatar Vakhtang Tsulaia
Browse files

Merge branch 'lcg104d_20240201' into 'main'

Projects: Update to LCG_104d_ATLAS_1, TDAQ/TDAQ-COMMON 11-02-01 and Externals 2.1.9

See merge request !68494
parents d510efc6 ec8f7977
No related branches found
No related tags found
1 merge request!68494Projects: Update to LCG_104d_ATLAS_1, TDAQ/TDAQ-COMMON 11-02-01 and Externals 2.1.9
Showing with 16 additions and 16 deletions
......@@ -6,4 +6,4 @@
# forbidden.
# The version of atlas/atlasexternals to use:
AnalysisBaseExternalsVersion = 2.1.8
AnalysisBaseExternalsVersion = 2.1.9
......@@ -10,7 +10,7 @@ ATLAS_PROJECT_DIR=$(cd $(dirname ${BASH_SOURCE[0]}) && pwd)
ATLAS_EXT_PROJECT_NAME="AthAnalysisExternals"
ATLAS_BUILDTYPE="RelWithDebInfo"
ATLAS_EXTRA_CMAKE_ARGS=(-DLCG_VERSION_NUMBER=104
-DLCG_VERSION_POSTFIX="c_ATLAS_5"
-DLCG_VERSION_POSTFIX="d_ATLAS_1"
-DATLAS_ONNXRUNTIME_USE_CUDA=FALSE
-DATLAS_GAUDI_SOURCE="URL;https://gitlab.cern.ch/atlas/Gaudi/-/archive/v38r0.000/Gaudi-v38r0.000.tar.gz;URL_MD5;af374562de2c29151881f49b4d8b49cf")
ATLAS_EXTRA_MAKE_ARGS=()
......
......@@ -6,4 +6,4 @@
# forbidden.
# The version of atlas/atlasexternals to use:
AthAnalysisExternalsVersion = 2.1.8
AthAnalysisExternalsVersion = 2.1.9
......@@ -10,7 +10,7 @@ ATLAS_PROJECT_DIR=$(cd $(dirname ${BASH_SOURCE[0]}) && pwd)
ATLAS_EXT_PROJECT_NAME="AthGenerationExternals"
ATLAS_BUILDTYPE="RelWithDebInfo"
ATLAS_EXTRA_CMAKE_ARGS=(-DLCG_VERSION_NUMBER=104
-DLCG_VERSION_POSTFIX="c_ATLAS_5"
-DLCG_VERSION_POSTFIX="d_ATLAS_1"
-DATLAS_GAUDI_SOURCE="URL;https://gitlab.cern.ch/atlas/Gaudi/-/archive/v38r0.000/Gaudi-v38r0.000.tar.gz;URL_MD5;af374562de2c29151881f49b4d8b49cf"
-DATLAS_GEOMODEL_SOURCE="URL;https://gitlab.cern.ch/GeoModelDev/GeoModel/-/archive/5.0.3/GeoModel-5.0.3.tar.bz2;URL_MD5;8f00da4b18a60c574e6f3e4badcde7d2"
-DATLAS_GEOMODEL_PATCH=""
......
......@@ -6,4 +6,4 @@
# forbidden.
# The version of atlas/atlasexternals to use:
AthGenerationExternalsVersion = 2.1.8
AthGenerationExternalsVersion = 2.1.9
......@@ -10,7 +10,7 @@ ATLAS_PROJECT_DIR=$(cd $(dirname ${BASH_SOURCE[0]}) && pwd)
ATLAS_EXT_PROJECT_NAME="AthSimulationExternals"
ATLAS_BUILDTYPE="RelWithDebInfo"
ATLAS_EXTRA_CMAKE_ARGS=(-DLCG_VERSION_NUMBER=104
-DLCG_VERSION_POSTFIX="c_ATLAS_5"
-DLCG_VERSION_POSTFIX="d_ATLAS_1"
-DATLAS_GAUDI_SOURCE="URL;https://gitlab.cern.ch/atlas/Gaudi/-/archive/v38r0.000/Gaudi-v38r0.000.tar.gz;URL_MD5;af374562de2c29151881f49b4d8b49cf"
-DATLAS_GEOMODEL_SOURCE="URL;https://gitlab.cern.ch/GeoModelDev/GeoModel/-/archive/5.0.3/GeoModel-5.0.3.tar.bz2;URL_MD5;8f00da4b18a60c574e6f3e4badcde7d2"
-DATLAS_GEOMODEL_PATCH=""
......
......@@ -6,4 +6,4 @@
# forbidden.
# The version of atlas/atlasexternals to use:
AthSimulationExternalsVersion = 2.1.8
AthSimulationExternalsVersion = 2.1.9
......@@ -36,9 +36,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 "11-02-00" CACHE STRING
set( TDAQ-COMMON_VERSION "11-02-01" CACHE STRING
"The version of tdaq-common to use for the build" )
set( TDAQ_VERSION "11-02-00" CACHE STRING
set( TDAQ_VERSION "11-02-01" CACHE STRING
"The version of tdaq to use for the build" )
endif()
......
......@@ -10,7 +10,7 @@ ATLAS_PROJECT_DIR=$(cd $(dirname ${BASH_SOURCE[0]}) && pwd)
ATLAS_EXT_PROJECT_NAME="AthenaExternals"
ATLAS_BUILDTYPE="RelWithDebInfo"
ATLAS_EXTRA_CMAKE_ARGS=(-DLCG_VERSION_NUMBER=104
-DLCG_VERSION_POSTFIX="c_ATLAS_5"
-DLCG_VERSION_POSTFIX="d_ATLAS_1"
-DATLAS_GAUDI_SOURCE="URL;https://gitlab.cern.ch/atlas/Gaudi/-/archive/v38r0.000/Gaudi-v38r0.000.tar.gz;URL_MD5;af374562de2c29151881f49b4d8b49cf"
-DATLAS_ACTS_SOURCE="URL;https://github.com/acts-project/acts/archive/refs/tags/v32.0.2.tar.gz;URL_HASH;SHA256=a817a9b6434ae206c36b1c25df6139ffcde95234944d09e718125e14da7996b8"
-DATLAS_GEOMODEL_SOURCE="URL;https://gitlab.cern.ch/GeoModelDev/GeoModel/-/archive/5.0.3/GeoModel-5.0.3.tar.bz2;URL_MD5;8f00da4b18a60c574e6f3e4badcde7d2"
......
......@@ -6,4 +6,4 @@
# forbidden.
# The version of atlas/atlasexternals to use:
AthenaExternalsVersion = 2.1.8
AthenaExternalsVersion = 2.1.9
......@@ -8,7 +8,7 @@ project( DetCommon VERSION ${_version} LANGUAGES C CXX )
unset( _version )
# Set the version of tdaq-common to use for the build:
set( TDAQ-COMMON_VERSION "11-02-00" CACHE STRING
set( TDAQ-COMMON_VERSION "11-02-01" 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}"
......@@ -18,7 +18,7 @@ set( TDAQ-COMMON_ATROOT
find_package( AtlasCMake QUIET )
# Build the project against LCG:
set( LCG_VERSION_POSTFIX "c" # Needs to match tdaq release (NO layer, ATLINFR-3977)
set( LCG_VERSION_POSTFIX "d" # Needs to match tdaq release (NO layer, ATLINFR-3977)
CACHE STRING "Version postfix for the LCG release to use" )
set( LCG_VERSION_NUMBER 104
CACHE STRING "Version number for the LCG release to use" )
......
......@@ -6,4 +6,4 @@
# forbidden.
# The version of atlas/atlasexternals to use:
AtlasExternalsVersion = 2.1.8
AtlasExternalsVersion = 2.1.9
......@@ -10,7 +10,7 @@ ATLAS_PROJECT_DIR=$(cd $(dirname ${BASH_SOURCE[0]}) && pwd)
ATLAS_EXT_PROJECT_NAME="VP1LightExternals"
ATLAS_BUILDTYPE="RelWithDebInfo"
ATLAS_EXTRA_CMAKE_ARGS=(-DLCG_VERSION_NUMBER=104
-DLCG_VERSION_POSTFIX="c_ATLAS_5"
-DLCG_VERSION_POSTFIX="d_ATLAS_1"
-DATLAS_GEOMODEL_SOURCE="URL;https://gitlab.cern.ch/GeoModelDev/GeoModel/-/archive/5.0.3/GeoModel-5.0.3.tar.bz2;URL_MD5;8f00da4b18a60c574e6f3e4badcde7d2"
-DATLAS_GEOMODEL_PATCH=""
-DATLAS_GEOMODEL_FORCEDOWNLOAD_MESSAGE="Forcing_the_re-download_of_GeoModel_(2024.01.27.)")
......
......@@ -6,4 +6,4 @@
# forbidden.
# The version of atlas/atlasexternals to use:
VP1LightExternalsVersion = 2.1.8
VP1LightExternalsVersion = 2.1.9
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