Skip to content
Snippets Groups Projects
Commit 49f914e3 authored by Dmitry Popov's avatar Dmitry Popov
Browse files

Merge branch 'v104r3-release' into 'Sim10'

Release of v104r3

See merge request lhcb/Geant4!43
parents d6eac53f af843a0b
No related branches found
No related tags found
1 merge request!43Release of v104r3
......@@ -5,7 +5,7 @@ CMAKE_MINIMUM_REQUIRED(VERSION 2.8.5)
set(GEANT4_SRCS_REPOSITORY https://gitlab.cern.ch/lhcb/Geant4-srcs.git CACHE STRING "Repository for Geant4 sources")
find_package(GaudiProject)
gaudi_project(Geant4 v104r2p1
gaudi_project(Geant4 v104r3
DATA Geant4Files VERSION v104r1)
# FIXME: hack for compatibility with CMT build
......
......@@ -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
......
2019-02-20 Geant4 v104r3
===
This release is based on `GEANT4 r10.4.3`, uses `LCG 93` and `Geant4Files v104r1`.
This version is released on `Sim10` branch.
## Latest Changes
#### LHCb production G4 Physics List option1NoApplyCuts
**[MR !42] Set preferred graphics library to silence CMake CMP0072 warning.**
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