From c03c184be015649cf049ce3fd11f907f3d46036b Mon Sep 17 00:00:00 2001 From: Stephen Kelly Date: Wed, 19 Nov 2014 09:37:21 +0100 Subject: [PATCH] Features: Record C++11 dialect switch only for GNU 4.7 and later. Previous versions of GNU are not currently supported by this CMake feature. --- Modules/Compiler/GNU-CXX.cmake | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/Modules/Compiler/GNU-CXX.cmake b/Modules/Compiler/GNU-CXX.cmake index 14dc76a9a..4129a38f7 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)