Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
athena
Manage
Activity
Members
Labels
Plan
Jira
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Locked files
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Container Registry
Model registry
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Code review analytics
Insights
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
atlas
athena
Merge requests
!46598
Update most projects to LCG101 and newer tdaq/tdaq-common
Code
Review changes
Check out branch
Download
Patches
Plain diff
Merged
Update most projects to LCG101 and newer tdaq/tdaq-common
elmsheus/athena:lcg101_20210917_1
into
master
Overview
33
Commits
7
Pipelines
6
Changes
7
Merged
Johannes Elmsheuser
requested to merge
elmsheus/athena:lcg101_20210917_1
into
master
3 years ago
Overview
15
Commits
7
Pipelines
6
Changes
7
Expand
Update the following projects to LCG101: Athena, AthDataQuality, AthGeneration, AthSimulation, DetCommon, VP1Light
Update Athena, AthDataQuality, DetCommon to TDAQ-COMMON 04-04-00 + TDAQ_VERSION 09-04-00
AthAnalysis and AnalysisBase will be updated in a separate later MR
Edited
3 years ago
by
Johannes Elmsheuser
0
0
Merge request reports
Compare
master
version 5
a1c731bd
3 years ago
version 4
7ddb7fd1
3 years ago
version 3
890f1973
3 years ago
version 2
82a90cfc
3 years ago
version 1
bd5e365f
3 years ago
master (base)
and
version 2
latest version
77fc73a6
7 commits,
3 years ago
version 5
a1c731bd
6 commits,
3 years ago
version 4
7ddb7fd1
5 commits,
3 years ago
version 3
890f1973
4 commits,
3 years ago
version 2
82a90cfc
2 commits,
3 years ago
version 1
bd5e365f
1 commit,
3 years ago
7 files
+
23
−
17
Inline
Compare changes
Side-by-side
Inline
Show whitespace changes
Show one file at a time
Files
7
Search (e.g. *.vue) (Ctrl+P)
Projects/AthDataQuality/CMakeLists.txt
+
3
−
3
Options
@@ -8,7 +8,7 @@ project( AthDataQuality VERSION ${_version} LANGUAGES C CXX )
unset
(
_version
)
# Set the version of tdaq-common to use for the build:
set
(
TDAQ-COMMON_VERSION
"04-0
3
-00"
CACHE STRING
set
(
TDAQ-COMMON_VERSION
"04-0
4
-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
}
"
@@ -18,9 +18,9 @@ set( TDAQ-COMMON_ATROOT
find_package
(
AtlasCMake REQUIRED
)
# Build the project against LCG:
set
(
LCG_VERSION_POSTFIX
"
_ATLAS_7
"
set
(
LCG_VERSION_POSTFIX
""
CACHE STRING
"Version postfix for the LCG release to use"
)
set
(
LCG_VERSION_NUMBER 10
0
set
(
LCG_VERSION_NUMBER 10
1
CACHE STRING
"Version number for the LCG release to use"
)
find_package
(
LCG
${
LCG_VERSION_NUMBER
}
EXACT REQUIRED
)
Loading