Skip to content
Snippets Groups Projects

Migrate 'master' to G4 v10r3p1

Closed Dmitry Popov requested to merge switch_master_to_g4v10r3p1 into master
Files
4
@@ -38,13 +38,20 @@ endif()
@@ -38,13 +38,20 @@ 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")
 
# Fix the C++ standard for GCC 4.9
 
if(${GAUDI_CXX_STANDARD} STREQUAL "c++1y" AND $ENV{CMTOPT} MATCHES "gcc49")
 
set(CXX_STANDARD "c++14")
 
else()
 
set(CXX_STANDARD ${GAUDI_CXX_STANDARD})
 
endif()
 
include(ExternalProject)
include(ExternalProject)
ExternalProject_Add(Geant4
ExternalProject_Add(Geant4
GIT_REPOSITORY ${GEANT4_SRCS_REPOSITORY}
GIT_REPOSITORY ${GEANT4_SRCS_REPOSITORY}
GIT_TAG ${GEANT4_TAG}
GIT_TAG ${GEANT4_TAG}
CMAKE_ARGS -DCMAKE_TOOLCHAIN_FILE=${CMAKE_SOURCE_DIR}/toolchain.cmake
CMAKE_ARGS -DCMAKE_TOOLCHAIN_FILE=${CMAKE_SOURCE_DIR}/toolchain.cmake
-DGEANT4_BUILD_CXXSTD=${GAUDI_CXX_STANDARD}
-DGEANT4_BUILD_CXXSTD=${CXX_STANDARD}
-DGEANT4_INSTALL_DATA=OFF
-DGEANT4_INSTALL_DATA=OFF
-DGEANT4_USE_SYSTEM_CLHEP=ON
-DGEANT4_USE_SYSTEM_CLHEP=ON
-DGEANT4_USE_XM=ON
-DGEANT4_USE_XM=ON
Loading