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: I611ecba901a43acbcca19b93a4dcd9578b570bd8
Signed-off-by: Patrick Williams <patrick@stwcx.xyz>
diff --git a/meson.build b/meson.build
index 8524d33..059f043 100644
--- a/meson.build
+++ b/meson.build
@@ -44,7 +44,7 @@
)
gmock_dep = gtest_proj.dependency('gmock')
else
- assert(not get_option('tests').enabled(),
+ assert(not get_option('tests').allowed(),
'Googletest is required if tests are enabled')
endif
endif
diff --git a/test/meson.build b/test/meson.build
index f55315b..b400d6a 100644
--- a/test/meson.build
+++ b/test/meson.build
@@ -1,4 +1,4 @@
-if get_option('oe-sdk').enabled()
+if get_option('oe-sdk').allowed()
# Setup OE SYSROOT
OECORE_TARGET_SYSROOT = run_command('sh', '-c', 'echo $OECORE_TARGET_SYSROOT').stdout().strip()
if OECORE_TARGET_SYSROOT == ''
@@ -40,7 +40,7 @@
foreach t : vpd_test
test(t, executable(t.underscorify(),
[t, application_src],
- build_rpath: get_option('oe-sdk').enabled() ? rpath : '',
+ build_rpath: get_option('oe-sdk').allowed() ? rpath : '',
link_args: dynamic_linker,
cpp_args: ['-DIPZ_PARSER', '-DManagerTest'],
c_args: ['-Wno-unused-parameter',