diff --git a/CMakeLists.txt b/CMakeLists.txt index a29c65f442ae1dd4206c51421e7c946cb16b767d..89557f543a825c4433bc49e5d325cf1d8be4c065 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -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 diff --git a/Geant4/G4config/CMakeLists.txt b/Geant4/G4config/CMakeLists.txt index 027a437cca9de683a5055b3f3f5790cf669c04eb..307093f25e258acb9fdd9b4eb6eff74d0781c218 100644 --- a/Geant4/G4config/CMakeLists.txt +++ b/Geant4/G4config/CMakeLists.txt @@ -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 diff --git a/ReleaseNotes/v104r3.md b/ReleaseNotes/v104r3.md new file mode 100644 index 0000000000000000000000000000000000000000..39f952a3ff465eeccfde4c49efcf103b92b33c54 --- /dev/null +++ b/ReleaseNotes/v104r3.md @@ -0,0 +1,10 @@ +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.**