diff options
| author | Brad King <brad.king@kitware.com> | 2014-05-08 15:27:57 (GMT) |
|---|---|---|
| committer | CMake Topic Stage <kwrobot@kitware.com> | 2014-05-08 15:27:57 (GMT) |
| commit | 3e206022abede98b60c9932e50034e23ba677d0f (patch) | |
| tree | 72df05a59f1398f83010d2db407fb690f9a363df /Modules/Compiler | |
| parent | 9add7071a589892c856bbfd53aa79b352c3f3c08 (diff) | |
| parent | 4779542157c4fee31eedcd3c057fb19bdffe47bd (diff) | |
| download | CMake-3e206022abede98b60c9932e50034e23ba677d0f.zip CMake-3e206022abede98b60c9932e50034e23ba677d0f.tar.gz CMake-3e206022abede98b60c9932e50034e23ba677d0f.tar.bz2 | |
Merge topic 'minor-cleanups'
47795421 Fix whitespace in docs.
aa283b6b Features: Fix test for GNU 4.8.1.
bbfd4cd4 Features: Include the language of the compiler in error messages.
Diffstat (limited to 'Modules/Compiler')
| -rw-r--r-- | Modules/Compiler/GNU-CXX-FeatureTests.cmake | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Modules/Compiler/GNU-CXX-FeatureTests.cmake b/Modules/Compiler/GNU-CXX-FeatureTests.cmake index fe0ff0b..3aeb27f 100644 --- a/Modules/Compiler/GNU-CXX-FeatureTests.cmake +++ b/Modules/Compiler/GNU-CXX-FeatureTests.cmake @@ -3,7 +3,7 @@ set(_oldestSupported "(__GNUC__ * 100 + __GNUC_MINOR__) >= 408") # Introduced in GCC 4.8.1 -set(GNU481_CXX11 "((__GNUC__ * 100 + __GNUC_MINOR__) > 408 || __GNUC_PATCHLEVEL__ >= 1) && __cplusplus >= 201103L") +set(GNU481_CXX11 "((__GNUC__ * 100 + __GNUC_MINOR__) >= 408 && __GNUC_PATCHLEVEL__ >= 1) && __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") |