diff options
| author | Brad King <brad.king@kitware.com> | 2014-05-12 13:31:06 (GMT) |
|---|---|---|
| committer | CMake Topic Stage <kwrobot@kitware.com> | 2014-05-12 13:31:06 (GMT) |
| commit | f20bb8f00371e932a481f5a84e3418cb47cdb041 (patch) | |
| tree | 7e08f5c4f6c687c3f9ecc43c589bd38ec9b1031b /Modules/Compiler/GNU-CXX-FeatureTests.cmake | |
| parent | 68f6460f66554343afa5e05c1913b17323bdafbe (diff) | |
| parent | bc9a8bba4660e9216f87323006d936bf6d43f799 (diff) | |
| download | CMake-f20bb8f00371e932a481f5a84e3418cb47cdb041.zip CMake-f20bb8f00371e932a481f5a84e3418cb47cdb041.tar.gz CMake-f20bb8f00371e932a481f5a84e3418cb47cdb041.tar.bz2 | |
Merge topic 'minor-cleanups'
bc9a8bba Makefile: Undef FEATURE_STRING iteration define after use.
eb638c75 Tests: Make CompileFeatures feature list lang-specific.
e2f09aff CMakeConfigurableFile: Remove excess newline.
5109b042 Features: Fix GNU 4.8.1 version test.
6a9fdbeb Test: Parameterize the language in the CompileFeature test.
f5bf9d43 Tests: Make CompileFeature tests use highest standard known.
Diffstat (limited to 'Modules/Compiler/GNU-CXX-FeatureTests.cmake')
| -rw-r--r-- | Modules/Compiler/GNU-CXX-FeatureTests.cmake | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/Modules/Compiler/GNU-CXX-FeatureTests.cmake b/Modules/Compiler/GNU-CXX-FeatureTests.cmake index 5edb69e..64ddc59 100644 --- a/Modules/Compiler/GNU-CXX-FeatureTests.cmake +++ b/Modules/Compiler/GNU-CXX-FeatureTests.cmake @@ -3,11 +3,13 @@ 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(GNU481_CXX11 "((__GNUC__ * 10000 + __GNUC_MINOR__ * 100 + __GNUC_PATCHLEVEL__) >= 40801) && __cplusplus >= 201103L") set(_cmake_feature_test_cxx_decltype_incomplete_return_types "${GNU481_CXX11}") set(_cmake_feature_test_cxx_reference_qualified_functions "${GNU481_CXX11}") set(GNU48_CXX11 "(__GNUC__ * 100 + __GNUC_MINOR__) >= 408 && __cplusplus >= 201103L") set(_cmake_feature_test_cxx_alignas "${GNU48_CXX11}") +# The alignof feature works with GNU 4.7 and -std=c++11, but it is documented +# as available with GNU 4.8, so treat that as true. 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}") |