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: Icb327fb26f7ffe6c08b0220caf8a489dfb7d1248
Signed-off-by: Patrick Williams <patrick@stwcx.xyz>
diff --git a/test/meson.build b/test/meson.build
index 7a6a9e7..fdf2908 100644
--- a/test/meson.build
+++ b/test/meson.build
@@ -1,5 +1,5 @@
oe_sdk = get_option('oe-sdk')
-if oe_sdk.enabled()
+if oe_sdk.allowed()
# Setup OE SYSROOT
OECORE_TARGET_SYSROOT = run_command('sh', '-c', 'echo $OECORE_TARGET_SYSROOT').stdout().strip()
if OECORE_TARGET_SYSROOT == ''
@@ -27,7 +27,7 @@
'test_utils.cpp',
include_directories: [psu_inc, test_inc],
link_args: dynamic_linker,
- build_rpath: oe_sdk.enabled() ? rpath : '',
+ build_rpath: oe_sdk.allowed() ? rpath : '',
dependencies: [
gtest,
gmock,
@@ -47,7 +47,7 @@
'test_version.cpp',
include_directories: [psu_inc, test_inc],
link_args: dynamic_linker,
- build_rpath: oe_sdk.enabled() ? rpath : '',
+ build_rpath: oe_sdk.allowed() ? rpath : '',
dependencies: [
gtest,
gmock,
diff --git a/vendor-example/meson.build b/vendor-example/meson.build
index cfb28c7..7c779a3 100644
--- a/vendor-example/meson.build
+++ b/vendor-example/meson.build
@@ -1,5 +1,5 @@
oe_sdk = get_option('oe-sdk')
-if oe_sdk.enabled()
+if oe_sdk.allowed()
# Setup OE SYSROOT
OECORE_TARGET_SYSROOT = run_command('sh', '-c', 'echo $OECORE_TARGET_SYSROOT').stdout().strip()
if OECORE_TARGET_SYSROOT == ''
@@ -22,6 +22,6 @@
executable(example, example + '.cpp',
implicit_include_directories: false,
link_args: dynamic_linker,
- build_rpath: oe_sdk.enabled() ? rpath : '')
+ build_rpath: oe_sdk.allowed() ? rpath : '')
endforeach