Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
L
lcgcmake
Manage
Activity
Members
Labels
Plan
Wiki
Jira
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Locked files
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Model registry
Operate
Environments
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
sft
lcgcmake
Merge requests
!377
Enable building Geant4 10.3.3 with ROOT v5 for NA61/SHINE
Code
Review changes
Check out branch
Download
Patches
Plain diff
Merged
Enable building Geant4 10.3.3 with ROOT v5 for NA61/SHINE
na61-infrastructure/shine-lcgcmake:SPI-1562
into
master
Overview
21
Commits
4
Pipelines
0
Changes
2
Merged
Antoni Marcinek
requested to merge
na61-infrastructure/shine-lcgcmake:SPI-1562
into
master
4 years ago
Overview
13
Commits
4
Pipelines
0
Changes
2
Expand
Closes
SPI-1562
0
0
Merge request reports
Compare
master
version 1
9e93a54e
4 years ago
master (base)
and
latest version
latest version
07cf9d51
4 commits,
4 years ago
version 1
9e93a54e
3 commits,
4 years ago
2 files
+
38
−
1
Inline
Compare changes
Side-by-side
Inline
Show whitespace changes
Show one file at a time
Files
2
Search (e.g. *.vue) (Ctrl+P)
externals/CMakeLists.txt
+
9
−
1
Options
@@ -491,7 +491,15 @@ LCGPackage_Add(
IF LCG_CPP11 OR LCG_CPP1Y OR LCG_CPP14 OR LCG_CPP17 THEN -DCLHEP_BUILD_CXXSTD=ON ENDIF
<SOURCE_DIR>/CLHEP
ENDIF
IF <VERSION> VERSION_GREATER 2.3.1 THEN
IF <VERSION> VERSION_GREATER 2.3.1 AND <VERSION> VERSION_LESS 2.4.0 THEN
CONFIGURE_COMMAND
${
CMAKE_COMMAND
}
-DCMAKE_INSTALL_PREFIX=<INSTALL_DIR>
-DCMAKE_BUILD_TYPE=
${
CMAKE_BUILD_TYPE
}
IF LCG_CPP11 THEN -DCLHEP_BUILD_CXXSTD=-std=c++11 ENDIF
IF LCG_CPP1Y THEN -DCLHEP_BUILD_CXXSTD=-std=c++1y ENDIF
IF LCG_CPP14 OR LCG_CPP17 THEN -DCLHEP_BUILD_CXXSTD=-std=c++14 ENDIF
<SOURCE_DIR>/CLHEP
ENDIF
IF <VERSION> VERSION_GREATER 2.4.0 THEN
CONFIGURE_COMMAND
${
CMAKE_COMMAND
}
-DCMAKE_INSTALL_PREFIX=<INSTALL_DIR>
-DCMAKE_BUILD_TYPE=
${
CMAKE_BUILD_TYPE
}
IF LCG_CPP11 THEN -DCLHEP_BUILD_CXXSTD=-std=c++11 ENDIF
Loading