diff options
| author | Brad King <brad.king@kitware.com> | 2016-10-26 13:22:13 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2016-10-26 13:22:13 (GMT) |
| commit | 075cc0f28c4409b94f1baaf6405acf923abfb1b6 (patch) | |
| tree | 4fb3274c05fce6fc81dfd741484ea5e6305bb9b2 | |
| parent | 4ec0329bf1cc39eddfa9dd5c58e83992b8979181 (diff) | |
| parent | 554b4f9010add22ef83bb22858f9fdcb52afbc7e (diff) | |
| download | CMake-075cc0f28c4409b94f1baaf6405acf923abfb1b6.zip CMake-075cc0f28c4409b94f1baaf6405acf923abfb1b6.tar.gz CMake-075cc0f28c4409b94f1baaf6405acf923abfb1b6.tar.bz2 | |
Merge branch 'intel-17-features' into release
| -rw-r--r-- | Modules/Compiler/Intel-CXX-FeatureTests.cmake | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/Modules/Compiler/Intel-CXX-FeatureTests.cmake b/Modules/Compiler/Intel-CXX-FeatureTests.cmake index e111c07..57a05c8 100644 --- a/Modules/Compiler/Intel-CXX-FeatureTests.cmake +++ b/Modules/Compiler/Intel-CXX-FeatureTests.cmake @@ -1,6 +1,7 @@ # References: # - https://software.intel.com/en-us/articles/c0x-features-supported-by-intel-c-compiler # - https://software.intel.com/en-us/articles/c14-features-supported-by-intel-c-compiler +# - http://www.open-std.org/jtc1/sc22/wg21/docs/papers/2016/p0096r3.html # FIXME: Intel C++ feature detection works only when simulating the GNU compiler. # When simulating MSVC, Intel always sets __cplusplus to 199711L. @@ -8,9 +9,8 @@ if("x${CMAKE_CXX_SIMULATE_ID}" STREQUAL "xMSVC") return() endif() -# these are not implemented in any version at time of writing -#set(_cmake_feature_test_cxx_variable_templates "${Intel15_CXX14}") -#set(_cmake_feature_test_cxx_relaxed_constexpr "${Intel15_CXX14}") +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__))") |