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: I794c658531483266bfce6f9b28127a166ed01490
Signed-off-by: Patrick Williams <patrick@stwcx.xyz>
diff --git a/common/test/meson.build b/common/test/meson.build
index 9e5517e..3ad51a6 100644
--- a/common/test/meson.build
+++ b/common/test/meson.build
@@ -10,7 +10,7 @@
test(t, executable(t.underscorify(), t + '.cpp',
implicit_include_directories: false,
link_args: dynamic_linker,
- build_rpath: get_option('oe-sdk').enabled() ? rpath : '',
+ build_rpath: get_option('oe-sdk').allowed() ? rpath : '',
dependencies: [
common_test_src,
gtest,
diff --git a/configurations/meson.build b/configurations/meson.build
index 5c6c605..caf5aab 100644
--- a/configurations/meson.build
+++ b/configurations/meson.build
@@ -8,7 +8,7 @@
install_data('fru_master.json', install_dir: package_datadir)
endif
-if get_option('oem-ibm').enabled()
+if get_option('oem-ibm').allowed()
install_subdir('../oem/ibm/configurations/fru', install_dir: package_datadir)
install_subdir('../oem/ibm/configurations/events', install_dir: package_datadir)
install_subdir('../oem/ibm/configurations/bios', install_dir: package_datadir)
diff --git a/fw-update/test/meson.build b/fw-update/test/meson.build
index ee1bdb1..a3fec9c 100644
--- a/fw-update/test/meson.build
+++ b/fw-update/test/meson.build
@@ -18,7 +18,7 @@
implicit_include_directories: false,
include_directories: '../../pldmd',
link_args: dynamic_linker,
- build_rpath: get_option('oe-sdk').enabled() ? rpath : '',
+ build_rpath: get_option('oe-sdk').allowed() ? rpath : '',
dependencies: [
fw_update_test_src,
gmock,
diff --git a/host-bmc/test/meson.build b/host-bmc/test/meson.build
index 9dee59f..92294eb 100644
--- a/host-bmc/test/meson.build
+++ b/host-bmc/test/meson.build
@@ -18,7 +18,7 @@
test_sources,
implicit_include_directories: false,
link_args: dynamic_linker,
- build_rpath: get_option('oe-sdk').enabled() ? rpath : '',
+ build_rpath: get_option('oe-sdk').allowed() ? rpath : '',
dependencies: [
gtest,
gmock,
diff --git a/libpldmresponder/meson.build b/libpldmresponder/meson.build
index 7de2cf2..f949db9 100644
--- a/libpldmresponder/meson.build
+++ b/libpldmresponder/meson.build
@@ -32,7 +32,7 @@
responder_headers = ['.']
-if get_option('oem-ibm').enabled()
+if get_option('oem-ibm').allowed()
responder_headers += [
'../oem/ibm/',
]
@@ -66,7 +66,7 @@
include_directories:include_directories(responder_headers),
link_with: libpldmresponder)
-if get_option('tests').enabled()
+if get_option('tests').allowed()
subdir('test')
endif
diff --git a/libpldmresponder/test/meson.build b/libpldmresponder/test/meson.build
index 73938b4..8c9a845 100644
--- a/libpldmresponder/test/meson.build
+++ b/libpldmresponder/test/meson.build
@@ -14,7 +14,7 @@
]
-if get_option('oem-ibm').enabled()
+if get_option('oem-ibm').allowed()
tests += [
'../../oem/ibm/test/libpldmresponder_fileio_test',
'../../oem/ibm/test/libpldmresponder_oem_platform_test'
@@ -26,7 +26,7 @@
implicit_include_directories: false,
include_directories: [ '../../requester', '../../pldmd' ],
link_args: dynamic_linker,
- build_rpath: get_option('oe-sdk').enabled() ? rpath : '',
+ build_rpath: get_option('oe-sdk').allowed() ? rpath : '',
dependencies: [
libpldm_dep,
libpldmresponder_dep,
diff --git a/meson.build b/meson.build
index 310f987..2e4d8fd 100644
--- a/meson.build
+++ b/meson.build
@@ -31,7 +31,7 @@
if cpp.has_header('poll.h')
conf_data.set('PLDM_HAS_POLL', 1)
endif
-if get_option('libpldmresponder').enabled()
+if get_option('libpldmresponder').allowed()
conf_data.set_quoted('BIOS_JSONS_DIR', join_paths(package_datadir, 'bios'))
conf_data.set_quoted('BIOS_TABLES_DIR', join_paths(package_localstatedir, 'bios'))
conf_data.set_quoted('PDR_JSONS_DIR', join_paths(package_datadir, 'pdr'))
@@ -45,10 +45,10 @@
conf_data.set('DBUS_TIMEOUT', get_option('dbus-timeout-value'))
add_project_arguments('-DLIBPLDMRESPONDER', language : ['c','cpp'])
endif
-if get_option('softoff').enabled()
+if get_option('softoff').allowed()
conf_data.set('SOFTOFF_TIMEOUT_SECONDS', get_option('softoff-timeout-seconds'))
endif
-if get_option('oem-ibm').enabled()
+if get_option('oem-ibm').allowed()
conf_data.set_quoted('FILE_TABLE_JSON', join_paths(package_datadir, 'fileTable.json'))
conf_data.set_quoted('LID_RUNNING_DIR', '/var/lib/phosphor-software-manager/hostfw/running')
conf_data.set_quoted('LID_ALTERNATE_DIR', '/var/lib/phosphor-software-manager/hostfw/alternate')
@@ -96,7 +96,7 @@
CLI11_dep = dependency('CLI11')
endif
-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 == ''
@@ -110,7 +110,7 @@
dynamic_linker = []
endif
-if get_option('tests').enabled()
+if get_option('tests').allowed()
gtest = dependency('gtest', main: true, disabler: true, required: false)
gmock = dependency('gmock', disabler: true, required: false)
if not gtest.found() or not gmock.found()
@@ -126,7 +126,7 @@
gmock = gtest_proj.dependency('gmock')
else
assert(
- not get_option('tests').enabled(),
+ not get_option('tests').allowed(),
'Googletest is required if tests are enabled'
)
endif
@@ -168,7 +168,7 @@
stdplus,
]
-if get_option('libpldmresponder').enabled()
+if get_option('libpldmresponder').allowed()
subdir('libpldmresponder')
deps += [
libpldmresponder_dep
@@ -190,7 +190,7 @@
install: true,
install_dir: get_option('bindir'))
-if get_option('systemd').enabled()
+if get_option('systemd').allowed()
systemd_system_unit_dir = dependency('systemd').get_variable(
'systemdsystemunitdir')
filesystem.copyfile(
@@ -200,7 +200,7 @@
install_dir: systemd_system_unit_dir
)
- if get_option('oem-ibm').enabled()
+ if get_option('oem-ibm').allowed()
subdir('oem/ibm/service_files')
endif
endif
@@ -209,15 +209,15 @@
subdir('configurations')
-if get_option('utilities').enabled()
+if get_option('utilities').allowed()
subdir('utilities')
endif
-if get_option('softoff').enabled()
+if get_option('softoff').allowed()
subdir('softoff')
endif
-if get_option('tests').enabled()
+if get_option('tests').allowed()
subdir('common/test')
subdir('fw-update/test')
subdir('host-bmc/test')
diff --git a/pldmtool/meson.build b/pldmtool/meson.build
index 765bdba..17fe374 100644
--- a/pldmtool/meson.build
+++ b/pldmtool/meson.build
@@ -10,7 +10,7 @@
'pldmtool.cpp',
]
-if get_option('oem-ibm').enabled()
+if get_option('oem-ibm').allowed()
sources += [
'oem/ibm/pldm_oem_ibm.cpp',
]
diff --git a/requester/test/meson.build b/requester/test/meson.build
index b7a929f..a4f3cd8 100644
--- a/requester/test/meson.build
+++ b/requester/test/meson.build
@@ -8,7 +8,7 @@
implicit_include_directories: false,
include_directories: [ '../../', '../../pldmd' ],
link_args: dynamic_linker,
- build_rpath: get_option('oe-sdk').enabled() ? rpath : '',
+ build_rpath: get_option('oe-sdk').allowed() ? rpath : '',
dependencies: [
gtest,
gmock,
diff --git a/softoff/meson.build b/softoff/meson.build
index 9c8f443..2d672af 100644
--- a/softoff/meson.build
+++ b/softoff/meson.build
@@ -16,7 +16,7 @@
install: true,
install_dir: get_option('bindir'))
-if get_option('systemd').enabled()
+if get_option('systemd').allowed()
filesystem.copyfile(
'services/pldmSoftPowerOff.service',
'pldmSoftPowerOff.service',
diff --git a/test/meson.build b/test/meson.build
index 1ae20c8..468f087 100644
--- a/test/meson.build
+++ b/test/meson.build
@@ -10,7 +10,7 @@
test(t, executable(t.underscorify(), t + '.cpp',
implicit_include_directories: false,
link_args: dynamic_linker,
- build_rpath: get_option('oe-sdk').enabled() ? rpath : '',
+ build_rpath: get_option('oe-sdk').allowed() ? rpath : '',
dependencies: [
libpldm_dep,
nlohmann_json,