summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBrad King <brad.king@kitware.com>2023-05-09 14:02:44 (GMT)
committerKitware Robot <kwrobot@kitware.com>2023-05-09 14:03:00 (GMT)
commitccc1157f8f62eed7b2d8dc3a1975dc3efdb6dc58 (patch)
tree13c4e82b097422181eff217a6940a0254c65a621
parenta2fba5967a1fd32dd75681c375fc7ea122f2cb38 (diff)
parenteacacc70fcf3bd320d9a05d180a0408b3429d2b9 (diff)
downloadCMake-ccc1157f8f62eed7b2d8dc3a1975dc3efdb6dc58.zip
CMake-ccc1157f8f62eed7b2d8dc3a1975dc3efdb6dc58.tar.gz
CMake-ccc1157f8f62eed7b2d8dc3a1975dc3efdb6dc58.tar.bz2
Merge topic 'clang_cxx23'
eacacc70fc Clang: use -std=c++23 for Clang 17.0+ Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !8460
-rw-r--r--Modules/Compiler/Clang.cmake5
1 files changed, 4 insertions, 1 deletions
diff --git a/Modules/Compiler/Clang.cmake b/Modules/Compiler/Clang.cmake
index 6c544fd..a21ba43 100644
--- a/Modules/Compiler/Clang.cmake
+++ b/Modules/Compiler/Clang.cmake
@@ -173,7 +173,10 @@ macro(__compiler_clang_cxx_standards lang)
unset(_clang_version_std17)
- if(NOT CMAKE_${lang}_COMPILER_VERSION VERSION_LESS 12.0)
+ if(NOT CMAKE_${lang}_COMPILER_VERSION VERSION_LESS 17.0)
+ set(CMAKE_${lang}23_STANDARD_COMPILE_OPTION "-std=c++23")
+ set(CMAKE_${lang}23_EXTENSION_COMPILE_OPTION "-std=gnu++23")
+ elseif(NOT CMAKE_${lang}_COMPILER_VERSION VERSION_LESS 12.0)
set(CMAKE_${lang}23_STANDARD_COMPILE_OPTION "-std=c++2b")
set(CMAKE_${lang}23_EXTENSION_COMPILE_OPTION "-std=gnu++2b")
endif()