diff options
| author | Brad King <brad.king@kitware.com> | 2023-01-18 15:47:07 (GMT) |
|---|---|---|
| committer | Kitware Robot <kwrobot@kitware.com> | 2023-01-18 15:47:17 (GMT) |
| commit | bdb4a4136b5f3b2233d958f8ce3decd0d981c1f4 (patch) | |
| tree | 30887e7f9b032ad0bf96bca74edfb9c2b9223ae4 | |
| parent | 63819be2eb98875ead5b0e0c4d6c1b0b75231892 (diff) | |
| parent | 4331f7b4bf024c20a06b28664e4f656210de7b5d (diff) | |
| download | CMake-bdb4a4136b5f3b2233d958f8ce3decd0d981c1f4.zip CMake-bdb4a4136b5f3b2233d958f8ce3decd0d981c1f4.tar.gz CMake-bdb4a4136b5f3b2233d958f8ce3decd0d981c1f4.tar.bz2 | |
Merge topic 'IntelLLVM-c++23'
4331f7b4bf IntelLLVM: Add provisional flags for C23 and C++23
42ca6416af IntelLLVM: Replace -Qstd= with -Qstd: on Windows
Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Alex <leha-bot@yandex.ru>
Merge-request: !8064
| -rw-r--r-- | Modules/Compiler/IntelLLVM-C.cmake | 6 | ||||
| -rw-r--r-- | Modules/Compiler/IntelLLVM-CXX.cmake | 18 |
2 files changed, 18 insertions, 6 deletions
diff --git a/Modules/Compiler/IntelLLVM-C.cmake b/Modules/Compiler/IntelLLVM-C.cmake index d7346f6..3a81154 100644 --- a/Modules/Compiler/IntelLLVM-C.cmake +++ b/Modules/Compiler/IntelLLVM-C.cmake @@ -41,6 +41,9 @@ if(NOT "x${CMAKE_C_SIMULATE_ID}" STREQUAL "xMSVC") set(CMAKE_C17_STANDARD_COMPILE_OPTION "-std=c17") set(CMAKE_C17_EXTENSION_COMPILE_OPTION "-std=gnu17") + + set(CMAKE_C23_STANDARD_COMPILE_OPTION "-std=c2x") + set(CMAKE_C23_EXTENSION_COMPILE_OPTION "-std=gnu2x") else() # clang-cl doesn't have any of these set(CMAKE_C90_STANDARD_COMPILE_OPTION "") @@ -54,6 +57,9 @@ else() set(CMAKE_C17_STANDARD_COMPILE_OPTION "") set(CMAKE_C17_EXTENSION_COMPILE_OPTION "") + + set(CMAKE_C23_STANDARD_COMPILE_OPTION "") + set(CMAKE_C23_EXTENSION_COMPILE_OPTION "") endif() __compiler_check_default_language_standard(C 2020 17) diff --git a/Modules/Compiler/IntelLLVM-CXX.cmake b/Modules/Compiler/IntelLLVM-CXX.cmake index 4d3f5a1..45b723f 100644 --- a/Modules/Compiler/IntelLLVM-CXX.cmake +++ b/Modules/Compiler/IntelLLVM-CXX.cmake @@ -46,6 +46,9 @@ if(NOT "x${CMAKE_CXX_SIMULATE_ID}" STREQUAL "xMSVC") set(CMAKE_CXX20_STANDARD_COMPILE_OPTION "-std=c++20") set(CMAKE_CXX20_EXTENSION_COMPILE_OPTION "-std=gnu++20") + + set(CMAKE_CXX23_STANDARD_COMPILE_OPTION "-std=c++2b") + set(CMAKE_CXX23_EXTENSION_COMPILE_OPTION "-std=gnu++2b") else() set(CMAKE_CXX98_STANDARD_COMPILE_OPTION "") set(CMAKE_CXX98_EXTENSION_COMPILE_OPTION "") @@ -53,14 +56,17 @@ else() set(CMAKE_CXX11_STANDARD_COMPILE_OPTION "") set(CMAKE_CXX11_EXTENSION_COMPILE_OPTION "") - set(CMAKE_CXX14_STANDARD_COMPILE_OPTION "-Qstd=c++14") - set(CMAKE_CXX14_EXTENSION_COMPILE_OPTION "-Qstd=c++14") + set(CMAKE_CXX14_STANDARD_COMPILE_OPTION "-Qstd:c++14") + set(CMAKE_CXX14_EXTENSION_COMPILE_OPTION "-Qstd:c++14") + + set(CMAKE_CXX17_STANDARD_COMPILE_OPTION "-Qstd:c++17") + set(CMAKE_CXX17_EXTENSION_COMPILE_OPTION "-Qstd:c++17") - set(CMAKE_CXX17_STANDARD_COMPILE_OPTION "-Qstd=c++17") - set(CMAKE_CXX17_EXTENSION_COMPILE_OPTION "-Qstd=c++17") + set(CMAKE_CXX20_STANDARD_COMPILE_OPTION "-Qstd:c++20") + set(CMAKE_CXX20_EXTENSION_COMPILE_OPTION "-Qstd:c++20") - set(CMAKE_CXX20_STANDARD_COMPILE_OPTION "-Qstd=c++20") - set(CMAKE_CXX20_EXTENSION_COMPILE_OPTION "-Qstd=c++20") + set(CMAKE_CXX23_STANDARD_COMPILE_OPTION "-Qstd:c++2b") + set(CMAKE_CXX23_EXTENSION_COMPILE_OPTION "-Qstd:c++2b") endif() __compiler_check_default_language_standard(CXX 2020 14) |