diff options
| author | Brad King <brad.king@kitware.com> | 2015-01-08 19:58:03 (GMT) |
|---|---|---|
| committer | CMake Topic Stage <kwrobot@kitware.com> | 2015-01-08 19:58:03 (GMT) |
| commit | 44b2dcb2e0c945339947c2e71b32f6da2fc4f610 (patch) | |
| tree | 1608bfac5bd4d10d3c6b54a3a4491ca91a0ce25f | |
| parent | 0042ad97480a236cd748f7d5aebc70ff21e75513 (diff) | |
| parent | 998ed4ca0a922faf08c7ee3e95f337ff9e8f02c1 (diff) | |
| download | CMake-44b2dcb2e0c945339947c2e71b32f6da2fc4f610.zip CMake-44b2dcb2e0c945339947c2e71b32f6da2fc4f610.tar.gz CMake-44b2dcb2e0c945339947c2e71b32f6da2fc4f610.tar.bz2 | |
Merge topic 'record-GNU-5-features'
998ed4ca Features: Record cxx_variable_templates for GNU 5.0.
| -rw-r--r-- | Modules/Compiler/GNU-CXX-FeatureTests.cmake | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/Modules/Compiler/GNU-CXX-FeatureTests.cmake b/Modules/Compiler/GNU-CXX-FeatureTests.cmake index 9c98e44..6de06dd 100644 --- a/Modules/Compiler/GNU-CXX-FeatureTests.cmake +++ b/Modules/Compiler/GNU-CXX-FeatureTests.cmake @@ -1,8 +1,15 @@ # Reference: http://gcc.gnu.org/projects/cxx0x.html +# http://gcc.gnu.org/projects/cxx1y.html set(_cmake_oldestSupported "(__GNUC__ * 100 + __GNUC_MINOR__) >= 407") +set(GNU50_CXX14 "(__GNUC__ * 100 + __GNUC_MINOR__) >= 500 && __cplusplus >= 201402L") +set(_cmake_feature_test_cxx_variable_templates "${GNU50_CXX14}") + +# GNU 4.9 in c++14 mode sets __cplusplus to 201300L, so don't test for the +# correct value of it below. +# https://patchwork.ozlabs.org/patch/382470/ set(GNU49_CXX14 "(__GNUC__ * 100 + __GNUC_MINOR__) >= 409 && __cplusplus > 201103L") set(_cmake_feature_test_cxx_contextual_conversions "${GNU49_CXX14}") set(_cmake_feature_test_cxx_attribute_deprecated "${GNU49_CXX14}") |