diff options
| author | Jussi Pakkanen <jpakkane@gmail.com> | 2018-08-11 21:25:51 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-08-11 21:25:51 +0300 |
| commit | d742e2e891b5a56558dd0eb9408c649585af6c89 (patch) | |
| tree | 0a55e97b12ad993100f7fd2a617cb4fae28aee2a | |
| parent | 7aeb90a55e7bf28386ada1b7480737138b9bc9e7 (diff) | |
| parent | b665db8bb89fd6c4f89f79686afde159e6ccd333 (diff) | |
| download | meson-d742e2e891b5a56558dd0eb9408c649585af6c89.zip meson-d742e2e891b5a56558dd0eb9408c649585af6c89.tar.gz meson-d742e2e891b5a56558dd0eb9408c649585af6c89.tar.bz2 | |
Merge pull request #4001 from mikezackles/cpp2a
Add support for c++2a and gnu++2a (closes #3997)
| -rw-r--r-- | mesonbuild/compilers/cpp.py | 8 | ||||
| -rwxr-xr-x | run_unittests.py | 8 |
2 files changed, 11 insertions, 5 deletions
diff --git a/mesonbuild/compilers/cpp.py b/mesonbuild/compilers/cpp.py index 7344114..2280f46 100644 --- a/mesonbuild/compilers/cpp.py +++ b/mesonbuild/compilers/cpp.py @@ -80,8 +80,8 @@ class ClangCPPCompiler(ClangCompiler, CPPCompiler): def get_options(self): opts = CPPCompiler.get_options(self) opts.update({'cpp_std': coredata.UserComboOption('cpp_std', 'C++ language standard to use', - ['none', 'c++98', 'c++03', 'c++11', 'c++14', 'c++17', 'c++1z', - 'gnu++11', 'gnu++14', 'gnu++17', 'gnu++1z'], + ['none', 'c++98', 'c++03', 'c++11', 'c++14', 'c++17', 'c++1z', 'c++2a', + 'gnu++11', 'gnu++14', 'gnu++17', 'gnu++1z', 'gnu++2a'], 'none')}) return opts @@ -139,8 +139,8 @@ class GnuCPPCompiler(GnuCompiler, CPPCompiler): def get_options(self): opts = CPPCompiler.get_options(self) opts.update({'cpp_std': coredata.UserComboOption('cpp_std', 'C++ language standard to use', - ['none', 'c++98', 'c++03', 'c++11', 'c++14', 'c++17', 'c++1z', - 'gnu++03', 'gnu++11', 'gnu++14', 'gnu++17', 'gnu++1z'], + ['none', 'c++98', 'c++03', 'c++11', 'c++14', 'c++17', 'c++1z', 'c++2a', + 'gnu++03', 'gnu++11', 'gnu++14', 'gnu++17', 'gnu++1z', 'gnu++2a'], 'none'), 'cpp_debugstl': coredata.UserBooleanOption('cpp_debugstl', 'STL debug mode', diff --git a/run_unittests.py b/run_unittests.py index 45b48f3..63547ee 100755 --- a/run_unittests.py +++ b/run_unittests.py @@ -3142,7 +3142,13 @@ class LinuxlikeTests(BasePlatformTests): for v in compiler.get_options()[lang_std].choices: if (compiler.get_id() == 'clang' and '17' in v and (version_compare(compiler.version, '<5.0.0') or - (compiler.clang_type == mesonbuild.compilers.CLANG_OSX and version_compare(compiler.version, '<9.2')))): + (compiler.clang_type == mesonbuild.compilers.CLANG_OSX and version_compare(compiler.version, '<9.1')))): + continue + if (compiler.get_id() == 'clang' and '2a' in v and + (version_compare(compiler.version, '<6.0.0') or + (compiler.clang_type == mesonbuild.compilers.CLANG_OSX and version_compare(compiler.version, '<9.1')))): + continue + if (compiler.get_id() == 'gcc' and '2a' in v and version_compare(compiler.version, '<8.0.0')): continue std_opt = '{}={}'.format(lang_std, v) self.init(testdir, ['-D' + std_opt]) |