Skip to content
Snippets Groups Projects

Release of v104r3

Merged Dmitry Popov requested to merge v104r3-release into Sim10
3 files
+ 15
2
Compare changes
  • Side-by-side
  • Inline
Files
3
@@ -30,7 +30,7 @@ if (NOT GEANT4_TAG)
@@ -30,7 +30,7 @@ if (NOT GEANT4_TAG)
elseif(CMAKE_PROJECT_VERSION STREQUAL "HEAD")
elseif(CMAKE_PROJECT_VERSION STREQUAL "HEAD")
# Special mapping of version HEAD
# Special mapping of version HEAD
# WARNING this must be kept up to date manually
# 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()
else()
set(GEANT4_TAG lhcb/${CMAKE_PROJECT_VERSION})
set(GEANT4_TAG lhcb/${CMAKE_PROJECT_VERSION})
endif()
endif()
@@ -38,6 +38,8 @@ endif()
@@ -38,6 +38,8 @@ endif()
set(GEANT4_TAG ${GEANT4_TAG} CACHE STRING "Tag of Geant4 to get from the Geant4-srcs repository")
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)
include(ExternalProject)
ExternalProject_Add(Geant4
ExternalProject_Add(Geant4
@@ -64,6 +66,7 @@ ExternalProject_Add(Geant4
@@ -64,6 +66,7 @@ ExternalProject_Add(Geant4
# -DLCG_USE_NATIVE_COMPILER=${LCG_USE_NATIVE_COMPILER}
# -DLCG_USE_NATIVE_COMPILER=${LCG_USE_NATIVE_COMPILER}
-DCMAKE_MODULE_PATH=${Geant4Files_DIR}
-DCMAKE_MODULE_PATH=${Geant4Files_DIR}
-DGEANT4_INSTALL_EXAMPLES=OFF
-DGEANT4_INSTALL_EXAMPLES=OFF
 
-DOpenGL_GL_PREFERENCE=${OpenGL_GL_PREFERENCE}
)
)
# Hardcoded list of external packages used by Geant4, needed to prepare the
# Hardcoded list of external packages used by Geant4, needed to prepare the
Loading