kolan
/
CMake
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge topic 'fix-GNU-CXX-dialect-versions' 

c03c184b Features: Record C++11 dialect switch only for GNU 4.7 and later.
This commit is contained in:
Brad King 2014-11-25 10:18:42 -05:00 committed by CMake Topic Stage
parent cbec5c0445 c03c184be0
commit 47f1020b54
1 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
Modules/Compiler/GNU-CXX.cmake
View File

@ -11,7 +11,8 @@ else()
endif()
endif()
if(NOT CMAKE_CXX_COMPILER_VERSION VERSION_LESS 4.3)
if(NOT CMAKE_CXX_COMPILER_VERSION VERSION_LESS 4.7)
# Supported since 4.3
set(CMAKE_CXX98_STANDARD_COMPILE_OPTION "-std=c++98")
set(CMAKE_CXX98_EXTENSION_COMPILE_OPTION "-std=gnu++98")
endif()
@ -19,9 +20,7 @@ endif()
if (NOT CMAKE_CXX_COMPILER_VERSION VERSION_LESS 4.7)
set(CMAKE_CXX11_STANDARD_COMPILE_OPTION "-std=c++11")
set(CMAKE_CXX11_EXTENSION_COMPILE_OPTION "-std=gnu++11")
elseif(NOT CMAKE_CXX_COMPILER_VERSION VERSION_LESS 4.3)
set(CMAKE_CXX11_STANDARD_COMPILE_OPTION "-std=c++0x")
set(CMAKE_CXX11_EXTENSION_COMPILE_OPTION "-std=gnu++0x")
# 4.3 supports 0x variants
endif()
if (NOT CMAKE_CXX_COMPILER_VERSION VERSION_LESS 4.9)