diff options
| author | Brad King <brad.king@kitware.com> | 2015-02-03 14:46:18 (GMT) |
|---|---|---|
| committer | CMake Topic Stage <kwrobot@kitware.com> | 2015-02-03 14:46:18 (GMT) |
| commit | 1acf36241fee134faed4355be2c9b5afa5500714 (patch) | |
| tree | bf53787b18e64ade337ea5eef110d05399db5176 | |
| parent | 460f7bcb7d11e905ee025c9d9cc9629d597fa91b (diff) | |
| parent | 68b5b23b3bd948ec15f2ebed2154db8ab50f66e9 (diff) | |
| download | CMake-1acf36241fee134faed4355be2c9b5afa5500714.zip CMake-1acf36241fee134faed4355be2c9b5afa5500714.tar.gz CMake-1acf36241fee134faed4355be2c9b5afa5500714.tar.bz2 | |
Merge topic 'GNU-5-CXX14'
68b5b23b Features: Update GNU 5.0 C++14 features.
| -rw-r--r-- | Modules/Compiler/GNU-CXX-FeatureTests.cmake | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/Modules/Compiler/GNU-CXX-FeatureTests.cmake b/Modules/Compiler/GNU-CXX-FeatureTests.cmake index 5fc3deb..d18adaf 100644 --- a/Modules/Compiler/GNU-CXX-FeatureTests.cmake +++ b/Modules/Compiler/GNU-CXX-FeatureTests.cmake @@ -6,6 +6,8 @@ set(_cmake_oldestSupported "(__GNUC__ * 100 + __GNUC_MINOR__) >= 404") set(GNU50_CXX14 "(__GNUC__ * 100 + __GNUC_MINOR__) >= 500 && __cplusplus >= 201402L") set(_cmake_feature_test_cxx_variable_templates "${GNU50_CXX14}") +set(_cmake_feature_test_cxx_relaxed_constexpr "${GNU50_CXX14}") +set(_cmake_feature_test_cxx_aggregate_default_initializers "${GNU50_CXX14}") # GNU 4.9 in c++14 mode sets __cplusplus to 201300L, so don't test for the # correct value of it below. |