From 4fa5b2ee42adfb8120ae329b10cd9a85b0ae5740 Mon Sep 17 00:00:00 2001 From: Xavier Claessens Date: Sun, 5 Feb 2023 12:14:56 +0100 Subject: mconf: Use auto_features value for auto options When project is configured with -Dauto_features=disabled, meson configure should not print "auto" value but "disabled" instead. --- mesonbuild/mconf.py | 3 +++ 1 file changed, 3 insertions(+) (limited to 'mesonbuild') diff --git a/mesonbuild/mconf.py b/mesonbuild/mconf.py index 33db57b..46d0463 100644 --- a/mesonbuild/mconf.py +++ b/mesonbuild/mconf.py @@ -194,11 +194,14 @@ class Conf: return if title: self.add_title(title) + auto = T.cast('coredata.UserFeatureOption', self.coredata.options[OptionKey('auto_features')]) for k, o in sorted(options.items()): printable_value = o.printable_value() root = k.as_root() if o.yielding and k.subproject and root in self.coredata.options: printable_value = '' + if isinstance(o, coredata.UserFeatureOption) and o.is_auto(): + printable_value = auto.printable_value() self.add_option(str(root), o.description, printable_value, o.choices) def print_conf(self, pager: bool): -- cgit v1.1