Skip to content
Snippets Groups Projects
Commit 11847847 authored by Johannes Elmsheuser's avatar Johannes Elmsheuser Committed by Frank Winklmeier
Browse files

Projects: Update to LCG_106b_ATLAS_1, atlasexternals 2.1.36 and tdaq/tdaq-common 12-00-00

Projects: Update to LCG_106b_ATLAS_1, atlasexternals 2.1.36 and tdaq/tdaq-common 12-00-00
parent ff30238f
No related branches found
No related tags found
No related merge requests found
...@@ -6,4 +6,4 @@ ...@@ -6,4 +6,4 @@
# forbidden. # forbidden.
# The version of atlas/atlasexternals to use: # The version of atlas/atlasexternals to use:
AnalysisBaseExternalsVersion = 2.1.35 AnalysisBaseExternalsVersion = 2.1.36
...@@ -10,7 +10,7 @@ ATLAS_PROJECT_DIR=$(cd $(dirname ${BASH_SOURCE[0]}) && pwd) ...@@ -10,7 +10,7 @@ ATLAS_PROJECT_DIR=$(cd $(dirname ${BASH_SOURCE[0]}) && pwd)
ATLAS_EXT_PROJECT_NAME="AthAnalysisExternals" ATLAS_EXT_PROJECT_NAME="AthAnalysisExternals"
ATLAS_BUILDTYPE="Release" ATLAS_BUILDTYPE="Release"
ATLAS_EXTRA_CMAKE_ARGS=(-DLCG_VERSION_NUMBER=106 ATLAS_EXTRA_CMAKE_ARGS=(-DLCG_VERSION_NUMBER=106
-DLCG_VERSION_POSTFIX="a_ATLAS_7" -DLCG_VERSION_POSTFIX="b_ATLAS_1"
-DATLAS_ONNXRUNTIME_USE_CUDA=FALSE -DATLAS_ONNXRUNTIME_USE_CUDA=FALSE
-DATLAS_GAUDI_SOURCE="URL;https://gitlab.cern.ch/atlas/Gaudi/-/archive/v39r1.001/Gaudi-v39r1.001.tar.gz;URL_MD5;ac2bdcde14c2feb7684e34d6e7879db8") -DATLAS_GAUDI_SOURCE="URL;https://gitlab.cern.ch/atlas/Gaudi/-/archive/v39r1.001/Gaudi-v39r1.001.tar.gz;URL_MD5;ac2bdcde14c2feb7684e34d6e7879db8")
ATLAS_EXTRA_MAKE_ARGS=() ATLAS_EXTRA_MAKE_ARGS=()
......
...@@ -6,4 +6,4 @@ ...@@ -6,4 +6,4 @@
# forbidden. # forbidden.
# The version of atlas/atlasexternals to use: # The version of atlas/atlasexternals to use:
AthAnalysisExternalsVersion = 2.1.35 AthAnalysisExternalsVersion = 2.1.36
...@@ -10,7 +10,7 @@ ATLAS_PROJECT_DIR=$(cd $(dirname ${BASH_SOURCE[0]}) && pwd) ...@@ -10,7 +10,7 @@ ATLAS_PROJECT_DIR=$(cd $(dirname ${BASH_SOURCE[0]}) && pwd)
ATLAS_EXT_PROJECT_NAME="AthGenerationExternals" ATLAS_EXT_PROJECT_NAME="AthGenerationExternals"
ATLAS_BUILDTYPE="Release" ATLAS_BUILDTYPE="Release"
ATLAS_EXTRA_CMAKE_ARGS=(-DLCG_VERSION_NUMBER=106 ATLAS_EXTRA_CMAKE_ARGS=(-DLCG_VERSION_NUMBER=106
-DLCG_VERSION_POSTFIX="a_ATLAS_7" -DLCG_VERSION_POSTFIX="b_ATLAS_1"
-DATLAS_GAUDI_SOURCE="URL;https://gitlab.cern.ch/atlas/Gaudi/-/archive/v39r1.001/Gaudi-v39r1.001.tar.gz;URL_MD5;ac2bdcde14c2feb7684e34d6e7879db8" -DATLAS_GAUDI_SOURCE="URL;https://gitlab.cern.ch/atlas/Gaudi/-/archive/v39r1.001/Gaudi-v39r1.001.tar.gz;URL_MD5;ac2bdcde14c2feb7684e34d6e7879db8"
-DATLAS_GEOMODEL_SOURCE="URL;https://gitlab.cern.ch/GeoModelDev/GeoModel/-/archive/6.7.0/GeoModel-6.7.0.tar.bz2;URL_MD5;450616aa33f97857aad3c7cbe1ff74fd") -DATLAS_GEOMODEL_SOURCE="URL;https://gitlab.cern.ch/GeoModelDev/GeoModel/-/archive/6.7.0/GeoModel-6.7.0.tar.bz2;URL_MD5;450616aa33f97857aad3c7cbe1ff74fd")
ATLAS_EXTRA_MAKE_ARGS=() ATLAS_EXTRA_MAKE_ARGS=()
......
...@@ -6,4 +6,4 @@ ...@@ -6,4 +6,4 @@
# forbidden. # forbidden.
# The version of atlas/atlasexternals to use: # The version of atlas/atlasexternals to use:
AthGenerationExternalsVersion = 2.1.35 AthGenerationExternalsVersion = 2.1.36
...@@ -10,7 +10,7 @@ ATLAS_PROJECT_DIR=$(cd $(dirname ${BASH_SOURCE[0]}) && pwd) ...@@ -10,7 +10,7 @@ ATLAS_PROJECT_DIR=$(cd $(dirname ${BASH_SOURCE[0]}) && pwd)
ATLAS_EXT_PROJECT_NAME="AthSimulationExternals" ATLAS_EXT_PROJECT_NAME="AthSimulationExternals"
ATLAS_BUILDTYPE="Release" ATLAS_BUILDTYPE="Release"
ATLAS_EXTRA_CMAKE_ARGS=(-DLCG_VERSION_NUMBER=106 ATLAS_EXTRA_CMAKE_ARGS=(-DLCG_VERSION_NUMBER=106
-DLCG_VERSION_POSTFIX="a_ATLAS_7" -DLCG_VERSION_POSTFIX="b_ATLAS_1"
-DATLAS_GAUDI_SOURCE="URL;https://gitlab.cern.ch/atlas/Gaudi/-/archive/v39r1.001/Gaudi-v39r1.001.tar.gz;URL_MD5;ac2bdcde14c2feb7684e34d6e7879db8" -DATLAS_GAUDI_SOURCE="URL;https://gitlab.cern.ch/atlas/Gaudi/-/archive/v39r1.001/Gaudi-v39r1.001.tar.gz;URL_MD5;ac2bdcde14c2feb7684e34d6e7879db8"
-DATLAS_GEOMODEL_SOURCE="URL;https://gitlab.cern.ch/GeoModelDev/GeoModel/-/archive/6.7.0/GeoModel-6.7.0.tar.bz2;URL_MD5;450616aa33f97857aad3c7cbe1ff74fd" -DATLAS_GEOMODEL_SOURCE="URL;https://gitlab.cern.ch/GeoModelDev/GeoModel/-/archive/6.7.0/GeoModel-6.7.0.tar.bz2;URL_MD5;450616aa33f97857aad3c7cbe1ff74fd"
-DATLAS_GEANT4_USE_LTO=TRUE -DATLAS_GEANT4_USE_LTO=TRUE
......
...@@ -6,4 +6,4 @@ ...@@ -6,4 +6,4 @@
# forbidden. # forbidden.
# The version of atlas/atlasexternals to use: # The version of atlas/atlasexternals to use:
AthSimulationExternalsVersion = 2.1.35 AthSimulationExternalsVersion = 2.1.36
...@@ -38,9 +38,9 @@ if( LCG_NIGHTLY ) ...@@ -38,9 +38,9 @@ if( LCG_NIGHTLY )
set( TDAQ_VERSION "99-00-00" CACHE STRING set( TDAQ_VERSION "99-00-00" CACHE STRING
"The version of tdaq to use for the build" ) "The version of tdaq to use for the build" )
else() else()
set( TDAQ-COMMON_VERSION "11-04-00" CACHE STRING set( TDAQ-COMMON_VERSION "12-00-00" CACHE STRING
"The version of tdaq-common to use for the build" ) "The version of tdaq-common to use for the build" )
set( TDAQ_VERSION "11-04-00" CACHE STRING set( TDAQ_VERSION "12-00-00" CACHE STRING
"The version of tdaq to use for the build" ) "The version of tdaq to use for the build" )
endif() endif()
......
...@@ -10,7 +10,7 @@ ATLAS_PROJECT_DIR=$(cd $(dirname ${BASH_SOURCE[0]}) && pwd) ...@@ -10,7 +10,7 @@ ATLAS_PROJECT_DIR=$(cd $(dirname ${BASH_SOURCE[0]}) && pwd)
ATLAS_EXT_PROJECT_NAME="AthenaExternals" ATLAS_EXT_PROJECT_NAME="AthenaExternals"
ATLAS_BUILDTYPE="Release" ATLAS_BUILDTYPE="Release"
ATLAS_EXTRA_CMAKE_ARGS=(-DLCG_VERSION_NUMBER=106 ATLAS_EXTRA_CMAKE_ARGS=(-DLCG_VERSION_NUMBER=106
-DLCG_VERSION_POSTFIX="a_ATLAS_7" -DLCG_VERSION_POSTFIX="b_ATLAS_1"
-DATLAS_GAUDI_SOURCE="URL;https://gitlab.cern.ch/atlas/Gaudi/-/archive/v39r1.001/Gaudi-v39r1.001.tar.gz;URL_MD5;ac2bdcde14c2feb7684e34d6e7879db8" -DATLAS_GAUDI_SOURCE="URL;https://gitlab.cern.ch/atlas/Gaudi/-/archive/v39r1.001/Gaudi-v39r1.001.tar.gz;URL_MD5;ac2bdcde14c2feb7684e34d6e7879db8"
-DATLAS_ACTS_SOURCE="URL;https://github.com/acts-project/acts/archive/refs/tags/v38.1.0.tar.gz;URL_HASH;SHA256=e85f0cfa778b39e81702d498176c144c2952311d5c89bed264942b8528095dbe" -DATLAS_ACTS_SOURCE="URL;https://github.com/acts-project/acts/archive/refs/tags/v38.1.0.tar.gz;URL_HASH;SHA256=e85f0cfa778b39e81702d498176c144c2952311d5c89bed264942b8528095dbe"
-DATLAS_GEOMODEL_SOURCE="URL;https://gitlab.cern.ch/GeoModelDev/GeoModel/-/archive/6.7.0/GeoModel-6.7.0.tar.bz2;URL_MD5;450616aa33f97857aad3c7cbe1ff74fd" -DATLAS_GEOMODEL_SOURCE="URL;https://gitlab.cern.ch/GeoModelDev/GeoModel/-/archive/6.7.0/GeoModel-6.7.0.tar.bz2;URL_MD5;450616aa33f97857aad3c7cbe1ff74fd"
......
...@@ -6,4 +6,4 @@ ...@@ -6,4 +6,4 @@
# forbidden. # forbidden.
# The version of atlas/atlasexternals to use: # The version of atlas/atlasexternals to use:
AthenaExternalsVersion = 2.1.35 AthenaExternalsVersion = 2.1.36
...@@ -8,7 +8,7 @@ project( DetCommon VERSION ${_version} LANGUAGES C CXX ) ...@@ -8,7 +8,7 @@ project( DetCommon VERSION ${_version} LANGUAGES C CXX )
unset( _version ) unset( _version )
# Set the version of tdaq-common to use for the build: # Set the version of tdaq-common to use for the build:
set( TDAQ-COMMON_VERSION "11-04-00" CACHE STRING set( TDAQ-COMMON_VERSION "12-00-00" CACHE STRING
"The version of tdaq-common to use for the build" ) "The version of tdaq-common to use for the build" )
set( TDAQ-COMMON_ATROOT set( TDAQ-COMMON_ATROOT
"$ENV{TDAQ_RELEASE_BASE}/tdaq-common/tdaq-common-${TDAQ-COMMON_VERSION}" "$ENV{TDAQ_RELEASE_BASE}/tdaq-common/tdaq-common-${TDAQ-COMMON_VERSION}"
...@@ -18,7 +18,7 @@ set( TDAQ-COMMON_ATROOT ...@@ -18,7 +18,7 @@ set( TDAQ-COMMON_ATROOT
find_package( AtlasCMake QUIET ) find_package( AtlasCMake QUIET )
# Build the project against LCG: # Build the project against LCG:
set( LCG_VERSION_POSTFIX "a" # Needs to match tdaq release (NO layer, ATLINFR-3977) set( LCG_VERSION_POSTFIX "b" # Needs to match tdaq release (NO layer, ATLINFR-3977)
CACHE STRING "Version postfix for the LCG release to use" ) CACHE STRING "Version postfix for the LCG release to use" )
set( LCG_VERSION_NUMBER 106 set( LCG_VERSION_NUMBER 106
CACHE STRING "Version number for the LCG release to use" ) CACHE STRING "Version number for the LCG release to use" )
......
...@@ -6,4 +6,4 @@ ...@@ -6,4 +6,4 @@
# forbidden. # forbidden.
# The version of atlas/atlasexternals to use: # The version of atlas/atlasexternals to use:
AtlasExternalsVersion = 2.1.35 AtlasExternalsVersion = 2.1.36
...@@ -6,4 +6,4 @@ ...@@ -6,4 +6,4 @@
# forbidden. # forbidden.
# The version of atlas/atlasexternals to use: # The version of atlas/atlasexternals to use:
VP1LightExternalsVersion = 2.1.35 VP1LightExternalsVersion = 2.1.36
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