diff options
| author | Brad King <brad.king@kitware.com> | 2017-03-31 18:29:25 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2017-03-31 18:29:25 (GMT) |
| commit | b1f35f1ffd94fb44cb8a6924805a53b64f2fd680 (patch) | |
| tree | 953f61115e5e543ba18cc8df3a616040fbecd85d /Modules | |
| parent | cf9f186e0daf5d696a5edf0578cad9ce32713916 (diff) | |
| parent | 4af0c9daf41dfe08c776e77f5b19aebd81469479 (diff) | |
| download | CMake-b1f35f1ffd94fb44cb8a6924805a53b64f2fd680.zip CMake-b1f35f1ffd94fb44cb8a6924805a53b64f2fd680.tar.gz CMake-b1f35f1ffd94fb44cb8a6924805a53b64f2fd680.tar.bz2 | |
Merge branch 'intel-compile-features' into release
Diffstat (limited to 'Modules')
| -rw-r--r-- | Modules/Compiler/Intel-CXX-FeatureTests.cmake | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/Modules/Compiler/Intel-CXX-FeatureTests.cmake b/Modules/Compiler/Intel-CXX-FeatureTests.cmake index e370647..929a7c6 100644 --- a/Modules/Compiler/Intel-CXX-FeatureTests.cmake +++ b/Modules/Compiler/Intel-CXX-FeatureTests.cmake @@ -13,7 +13,6 @@ # - __cpp_variadic_templates 200704 set(_cmake_feature_test_cxx_variable_templates "__cpp_variable_templates >= 201304") -set(_cmake_feature_test_cxx_relaxed_constexpr "__cpp_constexpr >= 201304") set(_cmake_oldestSupported "__INTEL_COMPILER >= 1210") set(DETECT_CXX11 "((__cplusplus >= 201103L) || defined(__INTEL_CXX11_MODE__) || defined(__GXX_EXPERIMENTAL_CXX0X__))") @@ -24,6 +23,9 @@ set(DETECT_BUGGY_ICC15 "((__INTEL_COMPILER == 1500) && (__INTEL_COMPILER_UPDATE set(DETECT_CXX14 "((__cplusplus >= 201300L) || ((__cplusplus == 201103L) && !defined(__INTEL_CXX11_MODE__)) || ((${DETECT_BUGGY_ICC15}) && defined(__GXX_EXPERIMENTAL_CXX0X__) && !defined(__INTEL_CXX11_MODE__) ) || (defined(__INTEL_CXX11_MODE__) && defined(__cpp_aggregate_nsdmi)) )") 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(Intel16_CXX14 "__INTEL_COMPILER >= 1600 && ${DETECT_CXX14}") set(_cmake_feature_test_cxx_aggregate_default_initializers "${Intel16_CXX14}") set(_cmake_feature_test_cxx_contextual_conversions "${Intel16_CXX14}") |