diff options
| author | Robert Maynard <robert.maynard@kitware.com> | 2019-05-09 10:55:55 -0400 |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2019-05-13 13:12:47 -0400 |
| commit | 62dbe53a8a2809c0c38386e5880acb446feacf28 (patch) | |
| tree | 29045d8d29ec5c106fe11845d7eacf2b842f5750 /Modules/Compiler | |
| parent | 1ebb0d79fe1330eea4b044bcfd9b613db8bfe86b (diff) | |
| download | cmake-62dbe53a8a2809c0c38386e5880acb446feacf28.tar.gz | |
CompileFeatures: Record when Intel gained full CXX14 support
Use the infrastructure added by commit 646fb1a646 (CompileFeatures:
memoize C++ compilers with full language level support, 2019-03-27) to
avoid using a `try_compile` to check for C++14 feature support when the
running compiler is known to have all features.
Diffstat (limited to 'Modules/Compiler')
| -rw-r--r-- | Modules/Compiler/Intel-CXX.cmake | 8 |
1 files changed, 1 insertions, 7 deletions
diff --git a/Modules/Compiler/Intel-CXX.cmake b/Modules/Compiler/Intel-CXX.cmake index 44b0c3d219..b630a6bc4a 100644 --- a/Modules/Compiler/Intel-CXX.cmake +++ b/Modules/Compiler/Intel-CXX.cmake @@ -40,13 +40,7 @@ else() set(CMAKE_CXX17_EXTENSION_COMPILE_OPTION "-std=gnu++17") endif() - # While full C++14 support was first introduced in Intel 17, - # Intel 18.0.0-4 don't have full support as they broke - # support for cxx_relaxed_constexpr. - if (CMAKE_CXX_COMPILER_VERSION VERSION_GREATER 18.0.4) - set(CMAKE_CXX14_STANDARD__HAS_FULL_SUPPORT ON) - elseif(CMAKE_CXX_COMPILER_VERSION VERSION_GREATER_EQUAL 17.0.0 - AND CMAKE_CXX_COMPILER_VERSION VERSION_LESS 18.0.0) + if (CMAKE_CXX_COMPILER_VERSION VERSION_GREATER_EQUAL 17.0) set(CMAKE_CXX14_STANDARD__HAS_FULL_SUPPORT ON) endif() |