commit a8ebb1db377b7a86ba5890723d5a0f7c4d636217
author Patrick Williams <patrick@stwcx.xyz> Wed Nov 29 06:44:15 2023 -0600
committer Patrick Williams <patrick@stwcx.xyz> Wed Nov 29 06:44:15 2023 -0600
tree b52c2a0cc73c498550bd55a2658b593b3d20cc9f
parent 2564451f911bd8bb3af4fdb84dbc94fab70f68e9

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: I1f8f77d3cd06d82c4d5390a910593f5e88c5581f
Signed-off-by: Patrick Williams <patrick@stwcx.xyz>

meson.build

diff --git a/meson.build b/meson.build
index 25b6643..3a00ca4 100644
--- a/meson.build
+++ b/meson.build
@@ -28,7 +28,7 @@
 conf_data.set('OCC_DIMM_TEMP_SENSOR_TYPE', 0xD0)
 conf_data.set('PS_DERATING_FACTOR', get_option('ps-derating-factor'))
 
-if get_option('i2c-occ').enabled()
+if get_option('i2c-occ').allowed()
     conf_data.set_quoted('OCC_HWMON_PATH', '/sys/bus/i2c/drivers/occ-hwmon/')
     conf_data.set_quoted('DEV_PATH', '/sys/bus/i2c/devices')
     conf_data.set_quoted('I2C_OCC_DEVICE_NAME', 'p8-occ-hwmon')
@@ -37,10 +37,10 @@
     conf_data.set_quoted('DEV_PATH', '/sys/bus/platform/devices/')
 endif
 
-conf_data.set('I2C_OCC', get_option('i2c-occ').enabled())
-conf_data.set('READ_OCC_SENSORS', get_option('read-occ-sensors').enabled())
+conf_data.set('I2C_OCC', get_option('i2c-occ').allowed())
+conf_data.set('READ_OCC_SENSORS', get_option('read-occ-sensors').allowed())
 conf_data.set('PLDM', get_option('with-host-communication-protocol')=='pldm')
-conf_data.set('POWER10', get_option('power10-support').enabled())
+conf_data.set('POWER10', get_option('power10-support').allowed())
 
 configure_file(output: 'config.h',
     configuration: conf_data
@@ -137,7 +137,7 @@
     ]
 endif
 
-if get_option('power10-support').enabled()
+if get_option('power10-support').allowed()
     sources += [
         'powermode.cpp',
     ]

test/meson.build

diff --git a/test/meson.build b/test/meson.build
index a0c7df8..440bec1 100644
--- a/test/meson.build
+++ b/test/meson.build
@@ -13,7 +13,7 @@
         gmock_dep = gtest_proj.dependency('gmock')
   else
         assert(
-            not get_option('tests').enabled(),
+            not get_option('tests').allowed(),
             'Googletest is required if tests are enabled'
         )
   endif
@@ -41,7 +41,7 @@
     ]
 endif
 
-if get_option('power10-support').enabled()
+if get_option('power10-support').allowed()
     test_sources += [
         '../powermode.cpp',
     ]