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:16 (GMT) |
| commit | df8ba4f10dd53698923dc6435f4d7575a1588dd4 (patch) | |
| tree | e738532e34107f46d9c7ce52ef2c86a04a4ff48e /Modules/Compiler | |
| parent | 4f5503866ef32fbce7f0f136b062181037ee06ac (diff) | |
| parent | 99c8dbf49762cd1b0346d1c70b01dc4d1ed4a0c7 (diff) | |
| download | CMake-df8ba4f10dd53698923dc6435f4d7575a1588dd4.zip CMake-df8ba4f10dd53698923dc6435f4d7575a1588dd4.tar.gz CMake-df8ba4f10dd53698923dc6435f4d7575a1588dd4.tar.bz2 | |
Merge topic 'intel-c++20' into release-3.18
99c8dbf497 Intel: Add flags for C++20
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4946
Diffstat (limited to 'Modules/Compiler')
| -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 1ed1b08..b71b946 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") @@ -37,6 +42,11 @@ if("x${CMAKE_CXX_SIMULATE_ID}" STREQUAL "xMSVC") else() + 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") |