diff options
| author | Brad King <brad.king@kitware.com> | 2022-03-11 15:33:02 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2022-03-11 15:33:02 (GMT) |
| commit | bb99538a45424c880021356139cb51f8873876c7 (patch) | |
| tree | 38eb5330b54f81d7b020d4bde4ca773a3065fad4 | |
| parent | 33ed5b97feee6f14571191d8216a60e09b589b8e (diff) | |
| parent | 683e4e9caba5fda32f9ae14473a0fe612c3f783c (diff) | |
| download | CMake-bb99538a45424c880021356139cb51f8873876c7.zip CMake-bb99538a45424c880021356139cb51f8873876c7.tar.gz CMake-bb99538a45424c880021356139cb51f8873876c7.tar.bz2 | |
Merge branch 'AppleClang-cxx20-cxx23-flags' into release-3.21
Merge-request: !7063
| -rw-r--r-- | Modules/Compiler/AppleClang-CXX.cmake | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/Modules/Compiler/AppleClang-CXX.cmake b/Modules/Compiler/AppleClang-CXX.cmake index 28be1df..7c97969 100644 --- a/Modules/Compiler/AppleClang-CXX.cmake +++ b/Modules/Compiler/AppleClang-CXX.cmake @@ -47,9 +47,17 @@ if (NOT CMAKE_CXX_COMPILER_VERSION VERSION_LESS 8.0) set(CMAKE_CXX11_STANDARD__HAS_FULL_SUPPORT ON) endif() -if (NOT CMAKE_CXX_COMPILER_VERSION VERSION_LESS 10.0) +if (NOT CMAKE_CXX_COMPILER_VERSION VERSION_LESS 13.0) + set(CMAKE_CXX20_STANDARD_COMPILE_OPTION "-std=c++20") + set(CMAKE_CXX20_EXTENSION_COMPILE_OPTION "-std=gnu++20") +elseif (NOT CMAKE_CXX_COMPILER_VERSION VERSION_LESS 10.0) set(CMAKE_CXX20_STANDARD_COMPILE_OPTION "-std=c++2a") set(CMAKE_CXX20_EXTENSION_COMPILE_OPTION "-std=gnu++2a") endif() +if (NOT CMAKE_CXX_COMPILER_VERSION VERSION_LESS 13.0) + set(CMAKE_CXX23_STANDARD_COMPILE_OPTION "-std=c++2b") + set(CMAKE_CXX23_EXTENSION_COMPILE_OPTION "-std=gnu++2b") +endif() + __compiler_check_default_language_standard(CXX 4.0 98) |