mirror/CMake
1
0
Fork 0
mirror of https://github.com/Kitware/CMake.git synced 2026-02-25 00:59:19 -06:00
Code Issues Packages Projects Releases Wiki Activity

Merge topic 'intel-compile-features'

Browse Source 
fc40bca590 Intel: Record support for relaxed constexpr by version 18.0.5

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !2862
This commit is contained in:
Brad King
2019-01-28 12:59:11 +00:00
committed by Kitware Robot
parent f411e936be fc40bca590
commit 6d57201868
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Modules/Compiler/Intel-CXX-FeatureTests.cmake
View File

@@ -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}")