2017-03-17 14:58:10 +01:00
|
|
|
--- a/mesonbuild/compilers.py
|
|
|
|
|
+++ b/mesonbuild/compilers.py
|
2017-03-17 15:21:59 +01:00
|
|
|
@@ -2403,9 +2403,13 @@ class GnuCPPCompiler(GnuCompiler, CPPCom
|
2017-03-17 14:58:10 +01:00
|
|
|
'3': default_warn_args + ['-Wextra', '-Wpedantic']}
|
|
|
|
|
|
|
|
|
|
def get_options(self):
|
|
|
|
|
+ c_stds = ['c++03', 'c++11']
|
|
|
|
|
+ g_stds = ['gnu++03', 'gnu++11']
|
|
|
|
|
+ if mesonlib.version_compare(self.version, '>=5.0.0'):
|
|
|
|
|
+ c_stds += ['c++14', 'c++1z']
|
|
|
|
|
+ g_stds += ['gnu++14', 'gnu++1z']
|
|
|
|
|
opts = {'cpp_std': coredata.UserComboOption('cpp_std', 'C++ language standard to use',
|
|
|
|
|
- ['none', 'c++03', 'c++11', 'c++14', 'c++1z',
|
|
|
|
|
- 'gnu++03', 'gnu++11', 'gnu++14', 'gnu++1z'],
|
|
|
|
|
+ ['none'] + c_stds + g_stds,
|
|
|
|
|
'none'),
|
|
|
|
|
'cpp_debugstl': coredata.UserBooleanOption('cpp_debugstl',
|
|
|
|
|
'STL debug mode',
|
