diff options
| author | Jussi Pakkanen <jpakkane@gmail.com> | 2016-03-20 22:04:24 +0200 |
|---|---|---|
| committer | Jussi Pakkanen <jpakkane@gmail.com> | 2016-03-20 22:04:24 +0200 |
| commit | d87eb7d2905eaa9ed7bac60945821c7b039298d8 (patch) | |
| tree | 65dd79f54b021f800f258410aca28bb151e0aa48 /mesonbuild/mconf.py | |
| parent | 9071c8fc454f5f56060bb979fa3ea01cc61e6ffb (diff) | |
| parent | a405f7a4994d7823b0e4429438e78a6b3dadecdc (diff) | |
| download | meson-d87eb7d2905eaa9ed7bac60945821c7b039298d8.zip meson-d87eb7d2905eaa9ed7bac60945821c7b039298d8.tar.gz meson-d87eb7d2905eaa9ed7bac60945821c7b039298d8.tar.bz2 | |
Merge branch 'base_options'.
Diffstat (limited to 'mesonbuild/mconf.py')
| -rw-r--r-- | mesonbuild/mconf.py | 16 |
1 files changed, 14 insertions, 2 deletions
diff --git a/mesonbuild/mconf.py b/mesonbuild/mconf.py index 72b3fbe..c8ea494 100644 --- a/mesonbuild/mconf.py +++ b/mesonbuild/mconf.py @@ -94,6 +94,9 @@ class Conf: elif k in self.coredata.compiler_options: tgt = self.coredata.compiler_options[k] tgt.set_value(v) + elif k in self.coredata.base_options: + tgt = self.coredata.base_options[k] + tgt.set_value(v) elif k.endswith('linkargs'): lang = k[:-8] if not lang in self.coredata.external_link_args: @@ -125,12 +128,21 @@ class Conf: carr.append(['warning_level', 'Warning level', self.coredata.get_builtin_option('warning_level'), warning_levels]) carr.append(['werror', 'Treat warnings as errors', self.coredata.get_builtin_option('werror'), booleans]) carr.append(['strip', 'Strip on install', self.coredata.get_builtin_option('strip'), booleans]) - carr.append(['coverage', 'Coverage report', self.coredata.get_builtin_option('coverage'), booleans]) - carr.append(['use_pch', 'Precompiled headers', self.coredata.get_builtin_option('use_pch'), booleans]) carr.append(['unity', 'Unity build', self.coredata.get_builtin_option('unity'), booleans]) carr.append(['default_library', 'Default library type', self.coredata.get_builtin_option('default_library'), libtypelist]) self.print_aligned(carr) print('') + print('Base options:') + okeys = sorted(self.coredata.base_options.keys()) + if len(okeys) == 0: + print(' No base options\n') + else: + coarr = [] + for k in okeys: + o = self.coredata.base_options[k] + coarr.append([k, o.description, o.value, '']) + self.print_aligned(coarr) + print('') print('Compiler arguments:') for (lang, args) in self.coredata.external_args.items(): print(' ' + lang + 'args', str(args)) |