diff options
| author | Brad King <brad.king@kitware.com> | 2018-06-05 15:28:29 +0000 |
|---|---|---|
| committer | Kitware Robot <kwrobot@kitware.com> | 2018-06-05 11:28:35 -0400 |
| commit | d902fb0cf698f48cadd8f234ad0c02ad9f363447 (patch) | |
| tree | 47a531a17c8abce414e0a4b46f93ac40bd3d6c74 | |
| parent | 8dbccd050c347dacbc4a40ace6253b0c61db86b6 (diff) | |
| parent | f719a13c28690fb44fbcd02ad1b5b9724c962d6b (diff) | |
| download | cmake-d902fb0cf698f48cadd8f234ad0c02ad9f363447.tar.gz | |
Merge topic 'intel-compile-features'
f719a13c28 Features: Add special case to disable relaxed constexpr for Intel 18
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !2133
| -rw-r--r-- | Modules/Compiler/Intel-CXX-FeatureTests.cmake | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Modules/Compiler/Intel-CXX-FeatureTests.cmake b/Modules/Compiler/Intel-CXX-FeatureTests.cmake index bbefe15dee..0df6c0fe92 100644 --- a/Modules/Compiler/Intel-CXX-FeatureTests.cmake +++ b/Modules/Compiler/Intel-CXX-FeatureTests.cmake @@ -24,7 +24,7 @@ set(DETECT_CXX14 "((__cplusplus >= 201300L) || ((__cplusplus == 201103L) && !def unset(DETECT_BUGGY_ICC15) set(Intel17_CXX14 "__INTEL_COMPILER >= 1700 && ${DETECT_CXX14}") -set(_cmake_feature_test_cxx_relaxed_constexpr "__cpp_constexpr >= 201304 || (${Intel17_CXX14} && !defined(_MSC_VER))") +set(_cmake_feature_test_cxx_relaxed_constexpr "__cpp_constexpr >= 201304 || (${Intel17_CXX14} && __INTEL_COMPILER != 1800 && !defined(_MSC_VER))") set(Intel16_CXX14 "__INTEL_COMPILER >= 1600 && ${DETECT_CXX14}") set(_cmake_feature_test_cxx_aggregate_default_initializers "${Intel16_CXX14}") |