diff options
| author | Brad King <brad.king@kitware.com> | 2020-06-29 12:16:11 (GMT) |
|---|---|---|
| committer | Kitware Robot <kwrobot@kitware.com> | 2020-06-29 12:16:17 (GMT) |
| commit | b1992cf9bdb3c4cf0a717eb44c84ed9de57a9336 (patch) | |
| tree | 5da81c291889f5386f7e6dbb1d0dc2c81c523d59 | |
| parent | df4d8838abddfa65224357105aa07be8da0ad090 (diff) | |
| parent | 85b151ff5b73d10b895595d4edd40b97f6cf8a3b (diff) | |
| download | CMake-b1992cf9bdb3c4cf0a717eb44c84ed9de57a9336.zip CMake-b1992cf9bdb3c4cf0a717eb44c84ed9de57a9336.tar.gz CMake-b1992cf9bdb3c4cf0a717eb44c84ed9de57a9336.tar.bz2 | |
Merge topic 'intel-c++20'
85b151ff5b Merge branch 'backport-intel-c++20' into intel-c++20
99c8dbf497 Intel: Add flags for C++20
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4946
| -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") |