diff options
| author | Brad King <brad.king@kitware.com> | 2014-05-08 15:28:03 (GMT) |
|---|---|---|
| committer | CMake Topic Stage <kwrobot@kitware.com> | 2014-05-08 15:28:03 (GMT) |
| commit | f1d504d6cd1812812520326171c4819febb76325 (patch) | |
| tree | 03a37ef4e49bbc5b024df2aa111ae88808bf5e53 /Modules | |
| parent | a07b979c1c1b6e89209889f4b1fe70d0e9ca6d45 (diff) | |
| parent | 9cbc63e40caa1c3afd771d1e20c4c4c188953c00 (diff) | |
| download | CMake-f1d504d6cd1812812520326171c4819febb76325.zip CMake-f1d504d6cd1812812520326171c4819febb76325.tar.gz CMake-f1d504d6cd1812812520326171c4819febb76325.tar.bz2 | |
Merge topic 'GNU-4.7-features'
9cbc63e4 Features: Record for GNU 4.7.
Diffstat (limited to 'Modules')
| -rw-r--r-- | Modules/Compiler/GNU-CXX-FeatureTests.cmake | 5 | ||||
| -rw-r--r-- | Modules/Compiler/GNU-CXX.cmake | 2 |
2 files changed, 3 insertions, 4 deletions
diff --git a/Modules/Compiler/GNU-CXX-FeatureTests.cmake b/Modules/Compiler/GNU-CXX-FeatureTests.cmake index 3aeb27f..5edb69e 100644 --- a/Modules/Compiler/GNU-CXX-FeatureTests.cmake +++ b/Modules/Compiler/GNU-CXX-FeatureTests.cmake @@ -1,7 +1,7 @@ # Reference: http://gcc.gnu.org/projects/cxx0x.html -set(_oldestSupported "(__GNUC__ * 100 + __GNUC_MINOR__) >= 408") +set(_oldestSupported "(__GNUC__ * 100 + __GNUC_MINOR__) >= 407") # Introduced in GCC 4.8.1 set(GNU481_CXX11 "((__GNUC__ * 100 + __GNUC_MINOR__) >= 408 && __GNUC_PATCHLEVEL__ >= 1) && __cplusplus >= 201103L") set(_cmake_feature_test_cxx_decltype_incomplete_return_types "${GNU481_CXX11}") @@ -12,8 +12,7 @@ set(_cmake_feature_test_cxx_alignof "${GNU48_CXX11}") set(_cmake_feature_test_cxx_attributes "${GNU48_CXX11}") set(_cmake_feature_test_cxx_inheriting_constructors "${GNU48_CXX11}") set(_cmake_feature_test_cxx_thread_local "${GNU48_CXX11}") -# TODO: Should be supported by GNU 4.7 -set(GNU47_CXX11 "${_oldestSupported} && __cplusplus >= 201103L") +set(GNU47_CXX11 "(__GNUC__ * 100 + __GNUC_MINOR__) >= 407 && __cplusplus >= 201103L") set(_cmake_feature_test_cxx_alias_templates "${GNU47_CXX11}") set(_cmake_feature_test_cxx_delegating_constructors "${GNU47_CXX11}") set(_cmake_feature_test_cxx_extended_friend_declarations "${GNU47_CXX11}") diff --git a/Modules/Compiler/GNU-CXX.cmake b/Modules/Compiler/GNU-CXX.cmake index d324985..1ecdad2 100644 --- a/Modules/Compiler/GNU-CXX.cmake +++ b/Modules/Compiler/GNU-CXX.cmake @@ -31,7 +31,7 @@ macro(cmake_record_cxx_compile_features) record_compiler_features(CXX "-std=${std_version}" ${list}) endmacro() - if (UNIX AND NOT APPLE AND NOT CMAKE_CXX_COMPILER_VERSION VERSION_LESS 4.8) + if (UNIX AND NOT APPLE AND NOT CMAKE_CXX_COMPILER_VERSION VERSION_LESS 4.7) _get_gcc_features(c++11 CMAKE_CXX11_COMPILE_FEATURES) if (_result EQUAL 0) _get_gcc_features(c++98 CMAKE_CXX98_COMPILE_FEATURES) |