meson: reformat with meson formatter
Apply the `meson format` results.
Change-Id: I1d83c80cac8bec7cae73afc40b77f629351f404c
Signed-off-by: Patrick Williams <patrick@stwcx.xyz>
diff --git a/meson.build b/meson.build
index 393f3b6..b75d9f9 100644
--- a/meson.build
+++ b/meson.build
@@ -2,9 +2,7 @@
'phosphor-health-monitor',
'cpp',
version: '1.0',
- default_options: [
- 'cpp_std=c++23',
- ],
+ default_options: ['cpp_std=c++23'],
meson_version: '>=1.1.1',
)
@@ -18,7 +16,7 @@
phosphor_dbus_interfaces_dep,
sdbusplus_dep,
sdeventplus_dep,
- nlohmann_json_dep
+ nlohmann_json_dep,
]
executable(
@@ -30,30 +28,31 @@
'health_metric_collection.cpp',
'health_monitor.cpp',
],
- dependencies: [
- base_deps
- ],
+ dependencies: [base_deps],
install: true,
- install_dir: get_option('bindir')
+ install_dir: get_option('bindir'),
)
conf_data = configuration_data()
conf_data.set('HEALTH_CONFIG_FILE', '"/etc/healthMon/bmc_health_config.json"')
-conf_data.set('MONITOR_COLLECTION_INTERVAL', get_option('monitor-collection-interval'))
+conf_data.set(
+ 'MONITOR_COLLECTION_INTERVAL',
+ get_option('monitor-collection-interval'),
+)
-configure_file(output : 'config.h',
- configuration : conf_data)
+configure_file(output: 'config.h', configuration: conf_data)
systemd = dependency('systemd')
conf_data = configuration_data()
conf_data.set('bindir', get_option('prefix') / get_option('bindir'))
configure_file(
- input: 'phosphor-health-monitor.service.in',
- output: 'phosphor-health-monitor.service',
- configuration: conf_data,
- install: true,
- install_dir: systemd.get_variable('systemdsystemunitdir'))
+ input: 'phosphor-health-monitor.service.in',
+ output: 'phosphor-health-monitor.service',
+ configuration: conf_data,
+ install: true,
+ install_dir: systemd.get_variable('systemdsystemunitdir'),
+)
if get_option('tests').allowed()
- subdir('test')
+ subdir('test')
endif
diff --git a/meson.options b/meson.options
index 4d4bc88..3045a0c 100644
--- a/meson.options
+++ b/meson.options
@@ -1,4 +1,9 @@
option('tests', type: 'feature', description: 'Build tests')
# Variables
-option('monitor-collection-interval', type: 'integer', value: 1, description: 'The health monitor collection interval in seconds.',)
+option(
+ 'monitor-collection-interval',
+ type: 'integer',
+ value: 1,
+ description: 'The health monitor collection interval in seconds.',
+)
diff --git a/test/meson.build b/test/meson.build
index 81c087c..6c22fcd 100644
--- a/test/meson.build
+++ b/test/meson.build
@@ -8,13 +8,13 @@
dependency('threads'),
gtest_proj.dependency('gtest'),
gtest_proj.dependency('gtest_main'),
- ]
+ ],
)
gmock_dep = gtest_proj.dependency('gmock')
else
assert(
not get_option('tests').enabled(),
- 'Googletest is required if tests are enabled'
+ 'Googletest is required if tests are enabled',
)
endif
endif
@@ -31,10 +31,10 @@
phosphor_logging_dep,
phosphor_dbus_interfaces_dep,
sdbusplus_dep,
- nlohmann_json_dep
+ nlohmann_json_dep,
],
include_directories: '../',
- )
+ ),
)
test(
@@ -51,10 +51,10 @@
phosphor_logging_dep,
phosphor_dbus_interfaces_dep,
sdbusplus_dep,
- nlohmann_json_dep
+ nlohmann_json_dep,
],
include_directories: '../',
- )
+ ),
)
test(
@@ -72,8 +72,8 @@
phosphor_logging_dep,
phosphor_dbus_interfaces_dep,
sdbusplus_dep,
- nlohmann_json_dep
+ nlohmann_json_dep,
],
include_directories: '../',
- )
+ ),
)