diff --git a/Geant4/G4config/CMakeLists.txt b/Geant4/G4config/CMakeLists.txt index 5607ae4af1e03e0e90ac1bfe739f238c06df7b4e..c0d35d43c318178b31fd34a7c3559cea67f019c9 100644 --- a/Geant4/G4config/CMakeLists.txt +++ b/Geant4/G4config/CMakeLists.txt @@ -38,6 +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