From b5ff5931b69dedbcee582ecc74bb8e59fb60e068 Mon Sep 17 00:00:00 2001 From: Dylan Baker Date: Fri, 6 Sep 2024 09:35:11 -0700 Subject: compilers/objcpp: Use shared C++ standards with ClangCPPStandard --- mesonbuild/compilers/cpp.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'mesonbuild/compilers/cpp.py') diff --git a/mesonbuild/compilers/cpp.py b/mesonbuild/compilers/cpp.py index 31a1c93e0..e051050e2 100644 --- a/mesonbuild/compilers/cpp.py +++ b/mesonbuild/compilers/cpp.py @@ -45,9 +45,9 @@ if T.TYPE_CHECKING: else: CompilerMixinBase = object -_ALL_STDS = ['c++98', 'c++0x', 'c++03', 'c++1y', 'c++1z', 'c++11', 'c++14', 'c++17', 'c++2a', 'c++20', 'c++23', 'c++26'] -_ALL_STDS += [f'gnu{std[1:]}' for std in _ALL_STDS] -_ALL_STDS += ['vc++11', 'vc++14', 'vc++17', 'vc++20', 'vc++latest', 'c++latest'] +ALL_STDS = ['c++98', 'c++0x', 'c++03', 'c++1y', 'c++1z', 'c++11', 'c++14', 'c++17', 'c++2a', 'c++20', 'c++23', 'c++26'] +ALL_STDS += [f'gnu{std[1:]}' for std in ALL_STDS] +ALL_STDS += ['vc++11', 'vc++14', 'vc++17', 'vc++20', 'vc++latest', 'c++latest'] def non_msvc_eh_options(eh: str, args: T.List[str]) -> None: @@ -175,7 +175,7 @@ class CPPCompiler(CLikeCompiler, Compiler): opts = super().get_options() key = self.form_compileropt_key('std') opts.update({ - key: options.UserStdOption('C++', _ALL_STDS), + key: options.UserStdOption('C++', ALL_STDS), }) return opts -- cgit v1.2.3