diff options
| author | Brad King <brad.king@kitware.com> | 2019-01-25 07:57:23 -0500 |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2019-01-25 07:57:23 -0500 |
| commit | 27eb8cc6ba96ae856c3ad12cfe0503e3d822482e (patch) | |
| tree | b5a6dfebc239a3b4240188992a21430d8ceaa12c | |
| parent | 329cf7f3e3ef4d64b4bdd274ad2b6cc376a6cb0e (diff) | |
| parent | fc40bca5902e6c29197696438211265e22efa84f (diff) | |
| download | cmake-27eb8cc6ba96ae856c3ad12cfe0503e3d822482e.tar.gz | |
Merge branch 'intel-compile-features' into release-3.13
Merge-request: !2862
| -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 0df6c0fe92..aa35b977e0 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} && __INTEL_COMPILER != 1800 && !defined(_MSC_VER))") +set(_cmake_feature_test_cxx_relaxed_constexpr "__cpp_constexpr >= 201304 || (${Intel17_CXX14} && !(__INTEL_COMPILER == 1800 && __INTEL_COMPILER_UPDATE < 5) && !defined(_MSC_VER))") set(Intel16_CXX14 "__INTEL_COMPILER >= 1600 && ${DETECT_CXX14}") set(_cmake_feature_test_cxx_aggregate_default_initializers "${Intel16_CXX14}") |