meson: reformat with meson formatter
Apply the `meson format` results.
Change-Id: Ia881ec1745179e1ced79cc1d6cddbb2743f390f2
Signed-off-by: Patrick Williams <patrick@stwcx.xyz>
diff --git a/meson.options b/meson.options
index f811930..de733c9 100644
--- a/meson.options
+++ b/meson.options
@@ -1,15 +1,85 @@
-option('adc', type: 'feature', value: 'enabled', description: 'Enable ADC sensor.',)
-option('intel-cpu', type: 'feature', value: 'enabled', description: 'Enable CPU sensor.',)
-option('exit-air', type: 'feature', value: 'enabled', description: 'Enable exit air sensor.',)
-option('fan', type: 'feature', value: 'enabled', description: 'Enable fan sensor.',)
-option('hwmon-temp', type: 'feature', value: 'enabled', description: 'Enable HWMON temperature sensor.',)
-option('intrusion', type: 'feature', value: 'enabled', description: 'Enable intrusion sensor.',)
-option('ipmb', type: 'feature', value: 'enabled', description: 'Enable IPMB sensor.',)
-option('mctp', type: 'feature', value: 'enabled', description: 'Enable MCTP endpoint management')
-option('mcu', type: 'feature', value: 'enabled', description: 'Enable MCU sensor.',)
-option('nvme', type: 'feature', value: 'enabled', description: 'Enable NVMe sensor.',)
-option('psu', type: 'feature', value: 'enabled', description: 'Enable PSU sensor.',)
-option('external', type: 'feature', value: 'enabled', description: 'Enable External sensor.',)
-option('tests', type: 'feature', value: 'enabled', description: 'Build tests.',)
-option('validate-unsecure-feature', type : 'feature', value : 'disabled', description : 'Enables unsecure features required by validation. Note: mustbe turned off for production images.',)
-option('insecure-sensor-override', type : 'feature', value : 'disabled', description : 'Enables Sensor override feature without any check.',)
+option(
+ 'adc',
+ type: 'feature',
+ value: 'enabled',
+ description: 'Enable ADC sensor.',
+)
+option(
+ 'intel-cpu',
+ type: 'feature',
+ value: 'enabled',
+ description: 'Enable CPU sensor.',
+)
+option(
+ 'exit-air',
+ type: 'feature',
+ value: 'enabled',
+ description: 'Enable exit air sensor.',
+)
+option(
+ 'fan',
+ type: 'feature',
+ value: 'enabled',
+ description: 'Enable fan sensor.',
+)
+option(
+ 'hwmon-temp',
+ type: 'feature',
+ value: 'enabled',
+ description: 'Enable HWMON temperature sensor.',
+)
+option(
+ 'intrusion',
+ type: 'feature',
+ value: 'enabled',
+ description: 'Enable intrusion sensor.',
+)
+option(
+ 'ipmb',
+ type: 'feature',
+ value: 'enabled',
+ description: 'Enable IPMB sensor.',
+)
+option(
+ 'mctp',
+ type: 'feature',
+ value: 'enabled',
+ description: 'Enable MCTP endpoint management',
+)
+option(
+ 'mcu',
+ type: 'feature',
+ value: 'enabled',
+ description: 'Enable MCU sensor.',
+)
+option(
+ 'nvme',
+ type: 'feature',
+ value: 'enabled',
+ description: 'Enable NVMe sensor.',
+)
+option(
+ 'psu',
+ type: 'feature',
+ value: 'enabled',
+ description: 'Enable PSU sensor.',
+)
+option(
+ 'external',
+ type: 'feature',
+ value: 'enabled',
+ description: 'Enable External sensor.',
+)
+option('tests', type: 'feature', value: 'enabled', description: 'Build tests.')
+option(
+ 'validate-unsecure-feature',
+ type: 'feature',
+ value: 'disabled',
+ description: 'Enables unsecure features required by validation. Note: mustbe turned off for production images.',
+)
+option(
+ 'insecure-sensor-override',
+ type: 'feature',
+ value: 'disabled',
+ description: 'Enables Sensor override feature without any check.',
+)
diff --git a/src/adc/meson.build b/src/adc/meson.build
index 02c69c4..2ba92df 100644
--- a/src/adc/meson.build
+++ b/src/adc/meson.build
@@ -4,12 +4,7 @@
'adcsensor',
'ADCSensor.cpp',
'ADCSensorMain.cpp',
- dependencies: [
- default_deps,
- gpiodcxx,
- thresholds_dep,
- utils_dep,
- ],
+ dependencies: [default_deps, gpiodcxx, thresholds_dep, utils_dep],
include_directories: src_inc,
install: true,
-)
\ No newline at end of file
+)
diff --git a/src/exit-air/meson.build b/src/exit-air/meson.build
index 70119af..2fb862b 100644
--- a/src/exit-air/meson.build
+++ b/src/exit-air/meson.build
@@ -3,11 +3,7 @@
executable(
'exitairtempsensor',
'ExitAirTempSensor.cpp',
- dependencies: [
- default_deps,
- thresholds_dep,
- utils_dep,
- ],
+ dependencies: [default_deps, thresholds_dep, utils_dep],
include_directories: src_inc,
install: true,
-)
\ No newline at end of file
+)
diff --git a/src/external/meson.build b/src/external/meson.build
index babde51..774a123 100644
--- a/src/external/meson.build
+++ b/src/external/meson.build
@@ -4,11 +4,7 @@
'externalsensor',
'ExternalSensor.cpp',
'ExternalSensorMain.cpp',
- dependencies: [
- default_deps,
- thresholds_dep,
- utils_dep,
- ],
+ dependencies: [default_deps, thresholds_dep, utils_dep],
include_directories: src_inc,
install: true,
-)
\ No newline at end of file
+)
diff --git a/src/fan/meson.build b/src/fan/meson.build
index 93f8ae6..1567a8e 100644
--- a/src/fan/meson.build
+++ b/src/fan/meson.build
@@ -6,12 +6,7 @@
'PresenceGpio.cpp',
'TachSensor.cpp',
'../PwmSensor.cpp',
- dependencies: [
- default_deps,
- gpiodcxx,
- thresholds_dep,
- utils_dep,
- ],
+ dependencies: [default_deps, gpiodcxx, thresholds_dep, utils_dep],
include_directories: src_inc,
install: true,
-)
\ No newline at end of file
+)
diff --git a/src/hwmon-temp/meson.build b/src/hwmon-temp/meson.build
index 3149960..431335f 100644
--- a/src/hwmon-temp/meson.build
+++ b/src/hwmon-temp/meson.build
@@ -4,12 +4,7 @@
'hwmontempsensor',
'HwmonTempMain.cpp',
'HwmonTempSensor.cpp',
- dependencies: [
- default_deps,
- devicemgmt_dep,
- thresholds_dep,
- utils_dep,
- ],
+ dependencies: [default_deps, devicemgmt_dep, thresholds_dep, utils_dep],
include_directories: src_inc,
install: true,
-)
\ No newline at end of file
+)
diff --git a/src/intel-cpu/meson.build b/src/intel-cpu/meson.build
index 03362da..8e519af 100644
--- a/src/intel-cpu/meson.build
+++ b/src/intel-cpu/meson.build
@@ -7,13 +7,7 @@
'intelcpusensor',
'IntelCPUSensorMain.cpp',
'IntelCPUSensor.cpp',
- dependencies: [
- default_deps,
- gpiodcxx,
- thresholds_dep,
- utils_dep,
- peci_dep,
- ],
+ dependencies: [default_deps, gpiodcxx, thresholds_dep, utils_dep, peci_dep],
include_directories: src_inc,
install: true,
-)
\ No newline at end of file
+)
diff --git a/src/intrusion/meson.build b/src/intrusion/meson.build
index f88d2c9..a62052c 100644
--- a/src/intrusion/meson.build
+++ b/src/intrusion/meson.build
@@ -4,12 +4,7 @@
'intrusionsensor',
'ChassisIntrusionSensor.cpp',
'IntrusionSensorMain.cpp',
- dependencies: [
- default_deps,
- gpiodcxx,
- i2c,
- utils_dep,
- ],
+ dependencies: [default_deps, gpiodcxx, i2c, utils_dep],
include_directories: src_inc,
install: true,
-)
\ No newline at end of file
+)
diff --git a/src/ipmb/meson.build b/src/ipmb/meson.build
index d724b80..ddab113 100644
--- a/src/ipmb/meson.build
+++ b/src/ipmb/meson.build
@@ -5,11 +5,7 @@
'IpmbSensorMain.cpp',
'IpmbSensor.cpp',
'IpmbSDRSensor.cpp',
- dependencies: [
- default_deps,
- thresholds_dep,
- utils_dep,
- ],
+ dependencies: [default_deps, thresholds_dep, utils_dep],
include_directories: src_inc,
install: true,
-)
\ No newline at end of file
+)
diff --git a/src/mctp/meson.build b/src/mctp/meson.build
index 2b10004..32009c7 100644
--- a/src/mctp/meson.build
+++ b/src/mctp/meson.build
@@ -3,6 +3,6 @@
'MCTPReactorMain.cpp',
'MCTPReactor.cpp',
'MCTPEndpoint.cpp',
- dependencies: [ default_deps, utils_dep ],
- install: true
+ dependencies: [default_deps, utils_dep],
+ install: true,
)
diff --git a/src/mcu/meson.build b/src/mcu/meson.build
index a817e77..e596e3e 100644
--- a/src/mcu/meson.build
+++ b/src/mcu/meson.build
@@ -3,12 +3,7 @@
executable(
'mcutempsensor',
'MCUTempSensor.cpp',
- dependencies: [
- default_deps,
- i2c,
- thresholds_dep,
- utils_dep,
- ],
+ dependencies: [default_deps, i2c, thresholds_dep, utils_dep],
include_directories: src_inc,
install: true,
-)
\ No newline at end of file
+)
diff --git a/src/meson.build b/src/meson.build
index 85b754b..ca995e5 100644
--- a/src/meson.build
+++ b/src/meson.build
@@ -27,11 +27,7 @@
utils_a = static_library(
'utils_a',
- [
- 'FileHandle.cpp',
- 'SensorPaths.cpp',
- 'Utils.cpp',
- ],
+ ['FileHandle.cpp', 'SensorPaths.cpp', 'Utils.cpp'],
dependencies: default_deps,
)
@@ -43,9 +39,7 @@
devicemgmt_a = static_library(
'devicemgmt_a',
- [
- 'DeviceMgmt.cpp',
- ],
+ ['DeviceMgmt.cpp'],
dependencies: default_deps,
)
diff --git a/src/nvme/meson.build b/src/nvme/meson.build
index 441d3e7..801201e 100644
--- a/src/nvme/meson.build
+++ b/src/nvme/meson.build
@@ -10,4 +10,4 @@
dependencies: nvme_deps,
include_directories: src_inc,
install: true,
-)
\ No newline at end of file
+)
diff --git a/src/psu/meson.build b/src/psu/meson.build
index 8f8df66..20af98c 100644
--- a/src/psu/meson.build
+++ b/src/psu/meson.build
@@ -14,4 +14,4 @@
],
include_directories: src_inc,
install: true,
-)
\ No newline at end of file
+)
diff --git a/src/tests/meson.build b/src/tests/meson.build
index c477843..8fc3477 100644
--- a/src/tests/meson.build
+++ b/src/tests/meson.build
@@ -19,9 +19,7 @@
endif
endif
-ut_deps_list = [
- gtest_dep,
-]
+ut_deps_list = [gtest_dep]
ut_deps_list += default_deps
src_inc = include_directories('..')
@@ -47,11 +45,7 @@
'../ipmb/IpmbSDRSensor.cpp',
'test_IpmbSensor.cpp',
dependencies: ut_deps_list,
- link_with: [
- utils_a,
- thresholds_a,
- devicemgmt_a
- ],
+ link_with: [utils_a, thresholds_a, devicemgmt_a],
implicit_include_directories: false,
include_directories: src_inc,
),
@@ -64,10 +58,10 @@
'test_MCTPReactor.cpp',
'../mctp/MCTPReactor.cpp',
'../mctp/MCTPEndpoint.cpp',
- dependencies: [ gmock_dep, ut_deps_list, utils_dep ],
+ dependencies: [gmock_dep, ut_deps_list, utils_dep],
implicit_include_directories: false,
- include_directories: '../mctp'
- )
+ include_directories: '../mctp',
+ ),
)
test(
@@ -76,8 +70,8 @@
'test_MCTPEndpoint',
'test_MCTPEndpoint.cpp',
'../mctp/MCTPEndpoint.cpp',
- dependencies: [ gmock_dep, ut_deps_list, utils_dep ],
+ dependencies: [gmock_dep, ut_deps_list, utils_dep],
implicit_include_directories: false,
- include_directories: '../mctp'
- )
+ include_directories: '../mctp',
+ ),
)
diff --git a/subprojects/packagefiles/boost/meson.build b/subprojects/packagefiles/boost/meson.build
index 6bb74af..81e714b 100644
--- a/subprojects/packagefiles/boost/meson.build
+++ b/subprojects/packagefiles/boost/meson.build
@@ -1,11 +1,5 @@
-project('boost',
- 'cpp',
- version : '1.83.0',
- license : 'Boost'
-)
+project('boost', 'cpp', version: '1.83.0', license: 'Boost')
-boost_dep = declare_dependency(
- include_directories : include_directories('.'),
-)
+boost_dep = declare_dependency(include_directories: include_directories('.'))
meson.override_dependency('boost', boost_dep)