diff options
| author | Brad King <brad.king@kitware.com> | 2019-04-22 12:26:49 (GMT) |
|---|---|---|
| committer | Kitware Robot <kwrobot@kitware.com> | 2019-04-22 12:26:56 (GMT) |
| commit | 800b2aad13ec36c61c6d4bfe825aed6afaacd301 (patch) | |
| tree | e918878ed6eb8763b11cfff63c4c230608ca604e /Tests | |
| parent | d0e37018616d43defbc16c752ca9b2be72261fb6 (diff) | |
| parent | 66f3f11af5ecea17680077c39c6e0fe7738ca34a (diff) | |
| download | CMake-800b2aad13ec36c61c6d4bfe825aed6afaacd301.zip CMake-800b2aad13ec36c61c6d4bfe825aed6afaacd301.tar.gz CMake-800b2aad13ec36c61c6d4bfe825aed6afaacd301.tar.bz2 | |
Merge topic 'sunpro-cxx14-features'
66f3f11af5 SunPro: Record support for C++14 features by SunPro 5.{14,15}
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !3248
Diffstat (limited to 'Tests')
| -rw-r--r-- | Tests/CompileFeatures/CMakeLists.txt | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/Tests/CompileFeatures/CMakeLists.txt b/Tests/CompileFeatures/CMakeLists.txt index 2dd8917..060fb49 100644 --- a/Tests/CompileFeatures/CMakeLists.txt +++ b/Tests/CompileFeatures/CMakeLists.txt @@ -52,6 +52,16 @@ if (CMAKE_CXX_COMPILER_ID STREQUAL "AppleClang" endif() if (CMAKE_CXX_COMPILER_ID STREQUAL SunPro) + if (CMAKE_CXX_COMPILER_VERSION VERSION_LESS 5.15) + # SunPro 5.14 accepts -std=c++14 and compiles two features but does + # not define __cplusplus to a value different than with -std=c++11. + list(REMOVE_ITEM CXX_non_features + cxx_aggregate_default_initializers + cxx_digit_separators + ) + endif() + + # FIXME: Do any of these work correctly on SunPro 5.13 or above? list(REMOVE_ITEM CXX_non_features cxx_attribute_deprecated cxx_contextual_conversions |