Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
G
Geant4
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Iterations
Requirements
Jira
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Locked files
Deploy
Releases
Model registry
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
Repository analytics
Code review analytics
Issue analytics
Insights
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
GitLab community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
LHCb
Geant4
Merge requests
!43
Release of v104r3
Code
Review changes
Check out branch
Open in Workspace
Download
Patches
Plain diff
Expand sidebar
Merged
Release of v104r3
v104r3-release
into
Sim10
Overview
0
Commits
3
Changes
3
Merged
Release of v104r3
Dmitry Popov
requested to merge
v104r3-release
into
Sim10
Feb 20, 2019
Overview
0
Commits
3
Changes
3
Notes and dependencies for
v104r3
release.
0
0
Merge request reports
Compare
Sim10
Sim10 (base)
and
latest version
latest version
af843a0b
3 commits,
Feb 20, 2019
3 files
+
15
−
2
Inline
Compare changes
Side-by-side
Inline
Show whitespace changes
Show one file at a time
Files
3
Geant4/G4config/CMakeLists.txt
+
4
−
1
View file @ af843a0b
Edit in single-file editor
Open in Web IDE
Show full file
@@ -30,7 +30,7 @@ if (NOT GEANT4_TAG)
elseif
(
CMAKE_PROJECT_VERSION STREQUAL
"HEAD"
)
# Special mapping of version HEAD
# WARNING this must be kept up to date manually
set
(
GEANT4_TAG
"lhcb/v10.4.
2
-branch"
)
set
(
GEANT4_TAG
"lhcb/v10.4.
3
-branch"
)
else
()
set
(
GEANT4_TAG lhcb/
${
CMAKE_PROJECT_VERSION
}
)
endif
()
@@ -38,6 +38,8 @@ endif()
set
(
GEANT4_TAG
${
GEANT4_TAG
}
CACHE STRING
"Tag of Geant4 to get from the Geant4-srcs repository"
)
set
(
OpenGL_GL_PREFERENCE
"GLVND"
CACHE STRING
"Preferred GL library to use (see https://cmake.org/cmake/help/v3.12/policy/CMP0072.html)"
)
include
(
ExternalProject
)
ExternalProject_Add
(
Geant4
@@ -64,6 +66,7 @@ ExternalProject_Add(Geant4
# -DLCG_USE_NATIVE_COMPILER=${LCG_USE_NATIVE_COMPILER}
-DCMAKE_MODULE_PATH=
${
Geant4Files_DIR
}
-DGEANT4_INSTALL_EXAMPLES=OFF
-DOpenGL_GL_PREFERENCE=
${
OpenGL_GL_PREFERENCE
}
)
# Hardcoded list of external packages used by Geant4, needed to prepare the
Loading