mirror/CMake
1
0
Fork 0
mirror of https://github.com/Kitware/CMake.git synced 2026-04-22 06:09:14 -05:00
Code Issues Packages Projects Releases Wiki Activity

Merge topic 'IntelLLVM-c++23'

Browse Source 
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
This commit is contained in:
Brad King
2023-01-18 15:47:07 +00:00
committed by Kitware Robot
parent 63819be2eb 4331f7b4bf
commit bdb4a4136b
2 changed files with 18 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Modules/Compiler/IntelLLVM-C.cmake
+6
View File
@@ -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)
Modules/Compiler/IntelLLVM-CXX.cmake
+12 -6
View File
@@ -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)