aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMoroz Oleg <o.moroz@1440.space>2021-10-12 09:19:19 +0300
committerJussi Pakkanen <jpakkane@gmail.com>2021-10-24 17:08:13 +0300
commit012ec7d5b3379b035f1dd1369d74cafd26ff6ab0 (patch)
tree8399cce8f0ddda6bbe534b6c909ddf90b014e5e1
parent2d8da3cb1167c47bb4425e5c58bb6c0c34f52e10 (diff)
downloadmeson-012ec7d5b3379b035f1dd1369d74cafd26ff6ab0.zip
meson-012ec7d5b3379b035f1dd1369d74cafd26ff6ab0.tar.gz
meson-012ec7d5b3379b035f1dd1369d74cafd26ff6ab0.tar.bz2
Add stdc++20 support for Visual Studio 2019 v16.11
fix #9242
-rw-r--r--mesonbuild/compilers/cpp.py4
1 files changed, 4 insertions, 0 deletions
diff --git a/mesonbuild/compilers/cpp.py b/mesonbuild/compilers/cpp.py
index 2e613ec..3eb9b90 100644
--- a/mesonbuild/compilers/cpp.py
+++ b/mesonbuild/compilers/cpp.py
@@ -598,10 +598,12 @@ class VisualStudioLikeCPPCompilerMixin(CompilerMixinBase):
'vc++11': (True, 11),
'vc++14': (True, 14),
'vc++17': (True, 17),
+ 'vc++20': (True, 20),
'vc++latest': (True, "latest"),
'c++11': (False, 11),
'c++14': (False, 14),
'c++17': (False, 17),
+ 'c++20': (False, 20),
'c++latest': (False, "latest"),
}
@@ -703,6 +705,8 @@ class VisualStudioCPPCompiler(CPP11AsCPP14Mixin, VisualStudioLikeCPPCompilerMixi
# Visual Studio 2017 and later
if version_compare(self.version, '>=19.11'):
cpp_stds.extend(['vc++14', 'c++17', 'vc++17'])
+ if version_compare(self.version, '>=19.29'):
+ cpp_stds.extend(['c++20', 'vc++20'])
return self._get_options_impl(super().get_options(), cpp_stds)
def get_option_compile_args(self, options: 'KeyedOptionDictType') -> T.List[str]: