Merged trunk changes.

1 files changed, 6 insertions, 1 deletions

diff --git a/mesonconf.py b/mesonconf.py
index adec6e2..db526b0 100755
--- a/mesonconf.py
+++ b/mesonconf.py
@@ -18,7 +18,7 @@ import sys, os
 import pickle
 import argparse
 import coredata, optinterpreter
-from meson import build_types, layouts
+from meson import build_types, layouts, warning_levels
 
 parser = argparse.ArgumentParser()
 
@@ -84,6 +84,10 @@ class Conf:
                 if v not in layouts:
                     raise ConfException('Invalid layout type %s.' % v)
                 self.coredata.layout = v
+            elif k == 'warnlevel':
+                if not v in warning_levels:
+                    raise ConfException('Invalid warning level %s.' % v)
+                self.coredata.warning_level = v
             elif k == 'strip':
                 self.coredata.strip = self.tobool(v)
             elif k == 'coverage':
@@ -162,6 +166,7 @@ class Conf:
         print('Core options\n')
         carr = []
         carr.append(['buildtype', 'Build type', self.coredata.buildtype])
+        carr.append(['warnlevel', 'Warning level', self.coredata.warning_level])
         carr.append(['strip', 'Strip on install', self.coredata.strip])
         carr.append(['coverage', 'Coverage report', self.coredata.coverage])
         carr.append(['pch', 'Precompiled headers', self.coredata.use_pch])