summaryrefslogtreecommitdiffstats
path: root/Modules/Compiler/GNU-CXX-FeatureTests.cmake
diff options
context:
space:
mode:
authorStephen Kelly <steveire@gmail.com>2015-01-10 19:05:54 (GMT)
committerStephen Kelly <steveire@gmail.com>2015-01-15 23:11:01 (GMT)
commitb15c008fac22720ccd793b18c235046bc84ecc86 (patch)
treea408797157bd20bd9e018e26cf5a867476322383 /Modules/Compiler/GNU-CXX-FeatureTests.cmake
parentf13a2eb118d8b152a897e09fdcf43793f8e1bcca (diff)
downloadCMake-b15c008fac22720ccd793b18c235046bc84ecc86.zip
CMake-b15c008fac22720ccd793b18c235046bc84ecc86.tar.gz
CMake-b15c008fac22720ccd793b18c235046bc84ecc86.tar.bz2
Features: Record for GNU 4.6.
Adjust the CompileFeatures genex_test for the expectation of the OVERRIDE_CONTROL feature group.
Diffstat (limited to 'Modules/Compiler/GNU-CXX-FeatureTests.cmake')
-rw-r--r--Modules/Compiler/GNU-CXX-FeatureTests.cmake4
1 files changed, 2 insertions, 2 deletions
diff --git a/Modules/Compiler/GNU-CXX-FeatureTests.cmake b/Modules/Compiler/GNU-CXX-FeatureTests.cmake
index 3c6c663..267d658 100644
--- a/Modules/Compiler/GNU-CXX-FeatureTests.cmake
+++ b/Modules/Compiler/GNU-CXX-FeatureTests.cmake
@@ -2,7 +2,7 @@
# Reference: http://gcc.gnu.org/projects/cxx0x.html
# http://gcc.gnu.org/projects/cxx1y.html
-set(_cmake_oldestSupported "(__GNUC__ * 100 + __GNUC_MINOR__) >= 407")
+set(_cmake_oldestSupported "(__GNUC__ * 100 + __GNUC_MINOR__) >= 406")
set(GNU50_CXX14 "(__GNUC__ * 100 + __GNUC_MINOR__) >= 500 && __cplusplus >= 201402L")
set(_cmake_feature_test_cxx_variable_templates "${GNU50_CXX14}")
@@ -60,7 +60,7 @@ set(_cmake_feature_test_cxx_user_literals "${GNU47_CXX11}")
# defined in the future.
set(GNU_CXX0X_DEFINED "(__cplusplus >= 201103L || (defined(__GXX_EXPERIMENTAL_CXX0X__) && __GXX_EXPERIMENTAL_CXX0X__))")
# TODO: Should be supported by GNU 4.6
-set(GNU46_CXX11 "${_cmake_oldestSupported} && ${GNU_CXX0X_DEFINED}")
+set(GNU46_CXX11 "(__GNUC__ * 100 + __GNUC_MINOR__) >= 406 && ${GNU_CXX0X_DEFINED}")
set(_cmake_feature_test_cxx_constexpr "${GNU46_CXX11}")
set(_cmake_feature_test_cxx_defaulted_move_initializers "${GNU46_CXX11}")
set(_cmake_feature_test_cxx_enum_forward_declarations "${GNU46_CXX11}")