diff options
| author | Brad King <brad.king@kitware.com> | 2020-06-26 12:24:46 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2020-06-26 12:24:46 (GMT) |
| commit | 85b151ff5b73d10b895595d4edd40b97f6cf8a3b (patch) | |
| tree | a2ffd9b0bbfa832e004f4f6f232cd39d5a8e2d05 | |
| parent | 035a3940f5c5ac4206b9b841be5d974e0b038c2f (diff) | |
| parent | 99c8dbf49762cd1b0346d1c70b01dc4d1ed4a0c7 (diff) | |
| download | CMake-85b151ff5b73d10b895595d4edd40b97f6cf8a3b.zip CMake-85b151ff5b73d10b895595d4edd40b97f6cf8a3b.tar.gz CMake-85b151ff5b73d10b895595d4edd40b97f6cf8a3b.tar.bz2 | |
Merge branch 'backport-intel-c++20' into intel-c++20
| -rw-r--r-- | Modules/Compiler/Intel-CXX.cmake | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/Modules/Compiler/Intel-CXX.cmake b/Modules/Compiler/Intel-CXX.cmake index 47d5672..42adfd1 100644 --- a/Modules/Compiler/Intel-CXX.cmake +++ b/Modules/Compiler/Intel-CXX.cmake @@ -11,6 +11,11 @@ if("x${CMAKE_CXX_SIMULATE_ID}" STREQUAL "xMSVC") set(CMAKE_CXX_CLANG_TIDY_DRIVER_MODE "cl") + if (NOT CMAKE_CXX_COMPILER_VERSION VERSION_LESS 19.0.0) + set(CMAKE_CXX20_STANDARD_COMPILE_OPTION "-Qstd=c++20") + set(CMAKE_CXX20_EXTENSION_COMPILE_OPTION "-Qstd=c++20") + endif() + if (NOT CMAKE_CXX_COMPILER_VERSION VERSION_LESS 18.0.0) set(CMAKE_CXX17_STANDARD_COMPILE_OPTION "-Qstd=c++17") set(CMAKE_CXX17_EXTENSION_COMPILE_OPTION "-Qstd=c++17") @@ -39,6 +44,11 @@ else() set(CMAKE_CXX_COMPILE_OPTIONS_EXPLICIT_LANGUAGE -x c++) + if (NOT CMAKE_CXX_COMPILER_VERSION VERSION_LESS 19.0.0) + set(CMAKE_CXX20_STANDARD_COMPILE_OPTION "-std=c++20") + set(CMAKE_CXX20_EXTENSION_COMPILE_OPTION "-std=gnu++20") + endif() + if (NOT CMAKE_CXX_COMPILER_VERSION VERSION_LESS 18.0.0) set(CMAKE_CXX17_STANDARD_COMPILE_OPTION "-std=c++17") set(CMAKE_CXX17_EXTENSION_COMPILE_OPTION "-std=gnu++17") |