summaryrefslogtreecommitdiffstats
path: root/Modules
diff options
context:
space:
mode:
authorBrad King <brad.king@kitware.com>2022-03-15 16:46:25 (GMT)
committerKitware Robot <kwrobot@kitware.com>2022-03-15 16:46:32 (GMT)
commit941605e427d97c81a2ae630b10187698914c523b (patch)
tree951d6b46d024a40ed40f249918db694f9c88e351 /Modules
parent8e21f244ec9ab5803fb8c8d19f938aef03f61ae2 (diff)
parent683e4e9caba5fda32f9ae14473a0fe612c3f783c (diff)
downloadCMake-941605e427d97c81a2ae630b10187698914c523b.zip
CMake-941605e427d97c81a2ae630b10187698914c523b.tar.gz
CMake-941605e427d97c81a2ae630b10187698914c523b.tar.bz2
Merge topic 'AppleClang-cxx20-cxx23-flags' into release-3.23
683e4e9cab AppleClang: Add C++20 and C++23 flags Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !7063
Diffstat (limited to 'Modules')
-rw-r--r--Modules/Compiler/AppleClang-CXX.cmake10
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)