diff options
| author | borg323 <39573933+borg323@users.noreply.github.com> | 2024-12-24 19:49:14 +0200 |
|---|---|---|
| committer | Jussi Pakkanen <jpakkane@gmail.com> | 2025-01-08 16:36:11 +0200 |
| commit | 3b28fbf0d97b53d831c01dfe98634cff3dc8a9ec (patch) | |
| tree | 6fce11e2307abe74f996985672a0d17d6897d5d6 /mesonbuild | |
| parent | b0827fc1e2c5d989fa57dc7d91ba330dffaaf0aa (diff) | |
| download | meson-3b28fbf0d97b53d831c01dfe98634cff3dc8a9ec.tar.gz | |
Update cpp language list for intel compiler on windows
Diffstat (limited to 'mesonbuild')
| -rw-r--r-- | mesonbuild/compilers/cpp.py | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/mesonbuild/compilers/cpp.py b/mesonbuild/compilers/cpp.py index 5b654be5d..2acc02ffe 100644 --- a/mesonbuild/compilers/cpp.py +++ b/mesonbuild/compilers/cpp.py @@ -916,8 +916,13 @@ class IntelClCPPCompiler(VisualStudioLikeCPPCompilerMixin, IntelVisualStudioLike IntelVisualStudioLikeCompiler.__init__(self, target) def get_options(self) -> 'MutableKeyedOptionDictType': - # This has only been tested with version 19.0, - cpp_stds = ['none', 'c++11', 'vc++11', 'c++14', 'vc++14', 'c++17', 'vc++17', 'c++latest'] + # This has only been tested with version 19.0, 2021.2.1, 2024.4.2 and 2025.0.1 + if version_compare(self.version, '<2021.1.0'): + cpp_stds = ['none', 'c++11', 'vc++11', 'c++14', 'vc++14', 'c++17', 'vc++17', 'c++latest'] + else: + cpp_stds = ['none', 'c++14', 'c++17', 'c++latest'] + if version_compare(self.version, '>=2024.1.0'): + cpp_stds += ['c++20'] return self._get_options_impl(super().get_options(), cpp_stds) def get_compiler_check_args(self, mode: CompileCheckMode) -> T.List[str]: |