Skip to content
Snippets Groups Projects
Commit 219088d8 authored by Dmitry Popov's avatar Dmitry Popov
Browse files

Fixed cxx standard for gcc49 + g4r10

parent 194478ea
Branches
Tags
1 merge request!24Migrate 'master' to G4 v10r3p3
...@@ -38,6 +38,13 @@ endif() ...@@ -38,6 +38,13 @@ 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
... ...
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please to comment