build: use allowed over enabled
Meson feature options are typically in a tri-state of enabled, disabled,
or auto. The enabled and disabled functions on an option (from
`get_option`) no longer return true for auto features. Instead, the
expectation is to use `allowed()` which is true for both enabled and auto.
Switch all uses of `enabled` to `allowed`.
Change-Id: I114b084eb227d4a767e404c14e4f3a613a5b83d6
Signed-off-by: Patrick Williams <patrick@stwcx.xyz>
diff --git a/meson.build b/meson.build
index 67442b5..7fca5e1 100644
--- a/meson.build
+++ b/meson.build
@@ -34,10 +34,10 @@
conf_data.set_quoted('HOST_IPMI_LIB_PATH', get_option('host-ipmi-lib-path'))
conf_data.set_quoted('FW_VER_REGEX', get_option('fw-ver-regex'))
-if get_option('shortname-remove-suffix').enabled()
+if get_option('shortname-remove-suffix').allowed()
conf_data.set_quoted('SHORTNAME_REMOVE_SUFFIX', '1')
endif
-if get_option('shortname-replace-words').enabled()
+if get_option('shortname-replace-words').allowed()
conf_data.set_quoted('SHORTNAME_REPLACE_WORDS', '1')
endif
if get_option('open-power').allowed()
@@ -92,7 +92,7 @@
}
foreach option_key, option_value : feature_map
- if(get_option(option_key).enabled())
+ if(get_option(option_key).allowed())
summary(option_key,option_value, section : 'Enabled Features')
add_project_arguments(option_value,language:'cpp')
endif