diff options
| author | Brad King <brad.king@kitware.com> | 2019-01-25 12:37:20 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2019-01-25 12:56:37 (GMT) |
| commit | fc40bca5902e6c29197696438211265e22efa84f (patch) | |
| tree | 2d5b3e4aa2725882136c12d0c3a1e495f8b66c0e | |
| parent | 8887ebc69b86606b388272d5c89ce11753bb4804 (diff) | |
| download | CMake-fc40bca5902e6c29197696438211265e22efa84f.zip CMake-fc40bca5902e6c29197696438211265e22efa84f.tar.gz CMake-fc40bca5902e6c29197696438211265e22efa84f.tar.bz2 | |
Intel: Record support for relaxed constexpr by version 18.0.5
Update the special case added by commit f719a13c28 (Features: Add
special case to disable relaxed constexpr for Intel 18, 2018-06-04,
v3.12.0-rc1~11^2) to record that 18.0.5 fixed the regression.
| -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 0df6c0f..aa35b97 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}") |