Commit 69d1ba84 authored by Lynn Garren's avatar Lynn Garren
Browse files

clarify that gcc must be 4.8 or later

parent 40b8e721
......@@ -87,7 +87,7 @@ macro( clhep_autoconf_variables )
endmacro( clhep_autoconf_variables )
macro( _clhep_verify_cxx0x )
message( FATAL_ERROR "The c++0x extension is no longer supported. Please use gcc 4.7.1 or later and c++11 or later.")
message( FATAL_ERROR "The c++0x extension is no longer supported. Please use c++11 or later.")
if( ${CMAKE_CXX_COMPILER_ID} STREQUAL "Clang" )
if( CMAKE_CXX_COMPILER_VERSION VERSION_LESS 2.9 )
message( FATAL_ERROR "c++0x extension is not available for ${CMAKE_CXX_COMPILER_ID}${CMAKE_CXX_COMPILER_VERSION}")
......@@ -115,6 +115,8 @@ macro( _clhep_verify_cxx11 )
elseif(CMAKE_COMPILER_IS_GNUCXX)
if( CMAKE_CXX_COMPILER_VERSION VERSION_LESS 4.7 )
message( FATAL_ERROR "c++11 extension is not available for ${CMAKE_CXX_COMPILER}")
elseif( CMAKE_CXX_COMPILER_VERSION VERSION_LESS 4.8 )
message( FATAL_ERROR "CLHEP now requires gcc 4.8 or later")
else()
set( HAVE_STDCXX true )
endif()
......@@ -169,13 +171,15 @@ macro( _clhep_check_cxxstd )
endif( CLHEP_DEBUG_MESSAGES )
set( HAVE_STDCXX )
if( "${CLHEP_BUILD_CXXSTD}" STREQUAL "-std=c++0x" )
message( FATAL_ERROR "The c++0x extension is no longer supported. Please use gcc 4.7.1 or later and c++11 or later.")
message( FATAL_ERROR "The c++0x extension is no longer supported. Please use c++11 or later.")
elseif( "${CLHEP_BUILD_CXXSTD}" STREQUAL "-std=c++11" )
_clhep_verify_cxx11()
elseif( "${CLHEP_BUILD_CXXSTD}" STREQUAL "-std=c++1y" )
_clhep_verify_cxx1y()
elseif( "${CLHEP_BUILD_CXXSTD}" STREQUAL "-std=c++14" )
_clhep_verify_cxx14()
elseif( DEFINED CLHEP_BUILD_CXXSTD )
message( FATAL_ERROR "${CLHEP_BUILD_CXXSTD} is not supported. Supported extensions are c++11, c++1y, and c++14.")
else()
# presume -std=c++11
set(CLHEP_BUILD_CXXSTD "-std=c++11")
......@@ -194,7 +198,7 @@ macro( _clhep_check_cxxstd )
endmacro( _clhep_check_cxxstd )
macro( _clhep_check_for_pthread )
message( FATAL_ERROR "_clhep_check_for_pthread should no longer be used. CLHEP now requires gcc 4.7.1 or later with c++11 or later.")
message( FATAL_ERROR "_clhep_check_for_pthread should no longer be used. CLHEP now requires gcc 4.8 or later with c++11 or later.")
##message(STATUS "_clhep_check_for_pthread debug: CMAKE_CXX_FLAGS: ${CMAKE_CXX_FLAGS}")
set( HAVE_STDCXX )
if( NOT "${CMAKE_CXX_FLAGS}" STREQUAL "" )
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment