From 219088d8876b0fef105eaf452c3221c9f131f1cb Mon Sep 17 00:00:00 2001
From: Dmitry Popov <Dmitry.Popov@cern.ch>
Date: Tue, 13 Jun 2017 21:36:19 +0200
Subject: [PATCH] Fixed cxx standard for gcc49 + g4r10
---
Geant4/G4config/CMakeLists.txt | 7 +++++++
1 file changed, 7 insertions(+)
diff --git a/Geant4/G4config/CMakeLists.txt b/Geant4/G4config/CMakeLists.txt
index 5607ae4af1..c0d35d43c3 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
--
GitLab