meson: Format build files according to meson style guide
muon[1], an meson-compatible build system, provides a `fmt` subcommand
to format meson build files in accordance with the meson style guide[2].
[1]: https://muon.build/
[2]: https://mesonbuild.com/Style-guide.html
Apply `muon fmt` using the following to provide consistent formatting:
```
for f in $(git ls-files | grep meson.build)
do
muon fmt $f | sponge $f
done
```
Change-Id: I7ef7693ddf964e9540b2e3e256cdf584fb8ac9cd
Signed-off-by: Andrew Jeffery <andrew@codeconstruct.com.au>
diff --git a/src/meson.build b/src/meson.build
index f0403ab..429f7c5 100644
--- a/src/meson.build
+++ b/src/meson.build
@@ -1,9 +1,17 @@
conf_data = configuration_data()
-conf_data.set10('VALIDATION_UNSECURE_FEATURE', get_option('validate-unsecure-feature').allowed())
-conf_data.set10('INSECURE_UNRESTRICTED_SENSOR_OVERRIDE', get_option('insecure-sensor-override').allowed())
-configure_file(input: 'dbus-sensor_config.h.in',
- output: 'dbus-sensor_config.h',
- configuration: conf_data)
+conf_data.set10(
+ 'VALIDATION_UNSECURE_FEATURE',
+ get_option('validate-unsecure-feature').allowed(),
+)
+conf_data.set10(
+ 'INSECURE_UNRESTRICTED_SENSOR_OVERRIDE',
+ get_option('insecure-sensor-override').allowed(),
+)
+configure_file(
+ input: 'dbus-sensor_config.h.in',
+ output: 'dbus-sensor_config.h',
+ configuration: conf_data,
+)
thresholds_a = static_library(
'thresholds_a',
@@ -12,7 +20,7 @@
)
thresholds_dep = declare_dependency(
- link_with: [ thresholds_a ],
+ link_with: [thresholds_a],
dependencies: default_deps,
)
@@ -27,8 +35,8 @@
)
utils_dep = declare_dependency(
- link_with: [ utils_a ],
- dependencies: [ sdbusplus ],
+ link_with: [utils_a],
+ dependencies: [sdbusplus],
)
devicemgmt_a = static_library(
@@ -40,19 +48,19 @@
)
devicemgmt_dep = declare_dependency(
- link_with: [ devicemgmt_a ],
+ link_with: [devicemgmt_a],
dependencies: default_deps,
)
pwmsensor_a = static_library(
'pwmsensor_a',
'PwmSensor.cpp',
- dependencies: [ default_deps, thresholds_dep ],
+ dependencies: [default_deps, thresholds_dep],
)
pwmsensor_dep = declare_dependency(
- link_with: [ pwmsensor_a ],
- dependencies: [ default_deps, thresholds_dep ],
+ link_with: [pwmsensor_a],
+ dependencies: [default_deps, thresholds_dep],
)
peci_incdirs = []
@@ -61,7 +69,7 @@
endif
if get_option('intel-cpu').allowed()
- peci_dep = dependency('libpeci', required : true)
+ peci_dep = dependency('libpeci', required: true)
endif
if get_option('adc').allowed()
@@ -184,10 +192,10 @@
endif
if get_option('nvme').allowed()
- nvme_srcs = files('NVMeSensorMain.cpp', 'NVMeSensor.cpp')
+ nvme_srcs = files('NVMeSensor.cpp', 'NVMeSensorMain.cpp')
nvme_srcs += files('NVMeBasicContext.cpp')
- nvme_deps = [ default_deps, i2c, thresholds_dep, utils_dep, threads ]
+ nvme_deps = [default_deps, i2c, thresholds_dep, utils_dep, threads]
executable(
'nvmesensor',