diff options
| author | Brad King <brad.king@kitware.com> | 2014-11-25 15:10:46 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2014-11-25 15:10:46 (GMT) |
| commit | c66f697a8bdceddbcc1bfa0ef1668418f80a921e (patch) | |
| tree | 0cefe6c537ac6c37e61c16a446692620c2f217ed /Modules | |
| parent | f8099e1c37094ae65506ce1f2ea78453556fc42d (diff) | |
| parent | c03c184be015649cf049ce3fd11f907f3d46036b (diff) | |
| download | CMake-c66f697a8bdceddbcc1bfa0ef1668418f80a921e.zip CMake-c66f697a8bdceddbcc1bfa0ef1668418f80a921e.tar.gz CMake-c66f697a8bdceddbcc1bfa0ef1668418f80a921e.tar.bz2 | |
Merge branch 'fix-GNU-CXX-dialect-versions' into release
Diffstat (limited to 'Modules')
| -rw-r--r-- | Modules/Compiler/GNU-CXX.cmake | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/Modules/Compiler/GNU-CXX.cmake b/Modules/Compiler/GNU-CXX.cmake index 14dc76a..4129a38 100644 --- a/Modules/Compiler/GNU-CXX.cmake +++ b/Modules/Compiler/GNU-CXX.cmake @@ -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.8) |