Update config: disable examples and use GAUDI_CXX_STANDARD

Geant4/G4config/CMakeLists.txt

@@ -38,20 +38,13 @@ endif()
 
 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)
 
 ExternalProject_Add(Geant4
    GIT_REPOSITORY ${GEANT4_SRCS_REPOSITORY}
    GIT_TAG ${GEANT4_TAG}
    CMAKE_ARGS -DCMAKE_TOOLCHAIN_FILE=${CMAKE_SOURCE_DIR}/toolchain.cmake
-              -DGEANT4_BUILD_CXXSTD=${CXX_STANDARD}
+              -DGEANT4_BUILD_CXXSTD=${GAUDI_CXX_STANDARD}
               -DGEANT4_INSTALL_DATA=OFF
               -DGEANT4_USE_SYSTEM_CLHEP=ON
               -DGEANT4_USE_XM=ON
@@ -70,6 +63,7 @@ ExternalProject_Add(Geant4
               -DCMAKE_USE_DISTCC=${CMAKE_USE_DISTCC}
               -DLCG_USE_NATIVE_COMPILER=${LCG_USE_NATIVE_COMPILER}
               -DCMAKE_MODULE_PATH=${Geant4Files_DIR}
+              -DGEANT4_INSTALL_EXAMPLES=OFF
 )
 
 # Hardcoded list of external packages used by Geant4, needed to prepare the