diff options
| author | Brad King <brad.king@kitware.com> | 2019-01-28 12:59:11 (GMT) |
|---|---|---|
| committer | Kitware Robot <kwrobot@kitware.com> | 2019-01-28 12:59:30 (GMT) |
| commit | 6d572018687cc2b398f59519e87f17c68836b267 (patch) | |
| tree | 3eb6f73589064a1940575dcee2ea703348ce104e /Modules | |
| parent | f411e936be6c5d0070c67aeb3baea150a01024a1 (diff) | |
| parent | fc40bca5902e6c29197696438211265e22efa84f (diff) | |
| download | CMake-6d572018687cc2b398f59519e87f17c68836b267.zip CMake-6d572018687cc2b398f59519e87f17c68836b267.tar.gz CMake-6d572018687cc2b398f59519e87f17c68836b267.tar.bz2 | |
Merge topic 'intel-compile-features'
fc40bca590 Intel: Record support for relaxed constexpr by version 18.0.5
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !2862
Diffstat (limited to 'Modules')
| -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}") |