meson: reformat with meson formatter
Apply the `meson format` results.
Change-Id: I3050039218fed8c4b4df4113bdfe273a329fe028
Signed-off-by: Patrick Williams <patrick@stwcx.xyz>
diff --git a/meson.build b/meson.build
index d9f410c..5549302 100644
--- a/meson.build
+++ b/meson.build
@@ -1,85 +1,80 @@
project(
- 'host-error-monitor',
- 'cpp',
- version: '1.0',
- meson_version: '>=1.1.1',
- default_options: [
- 'b_ndebug=if-release',
- 'cpp_rtti=false',
- 'cpp_std=c++20',
- 'warning_level=3',
- 'werror=true',
- ],
+ 'host-error-monitor',
+ 'cpp',
+ version: '1.0',
+ meson_version: '>=1.1.1',
+ default_options: [
+ 'b_ndebug=if-release',
+ 'cpp_rtti=false',
+ 'cpp_std=c++20',
+ 'warning_level=3',
+ 'werror=true',
+ ],
)
if (get_option('libpeci').allowed())
- add_project_arguments('-DLIBPECI', language: 'cpp')
+ add_project_arguments('-DLIBPECI', language: 'cpp')
endif
if (get_option('crashdump').allowed())
- add_project_arguments('-DCRASHDUMP', language: 'cpp')
+ add_project_arguments('-DCRASHDUMP', language: 'cpp')
endif
if (get_option('send-to-logger').allowed())
- add_project_arguments('-DSEND_TO_LOGGING_SERVICE', language: 'cpp')
+ add_project_arguments('-DSEND_TO_LOGGING_SERVICE', language: 'cpp')
endif
sdbusplus = dependency('sdbusplus')
-gpiodcxx = dependency(
- 'libgpiodcxx',
- default_options: ['bindings=cxx'],
-)
+gpiodcxx = dependency('libgpiodcxx', default_options: ['bindings=cxx'])
systemd = dependency('systemd', required: true)
systemd_system_unit_dir = systemd.get_variable(pkgconfig: 'systemdsystemunitdir')
-boost = dependency('boost', version: '>=1.82.0', required: false, include_type: 'system')
+boost = dependency(
+ 'boost',
+ version: '>=1.82.0',
+ required: false,
+ include_type: 'system',
+)
if not boost.found()
- boost = subproject('boost', required: true).get_variable('boost_dep')
- boost = boost.as_system('system')
+ boost = subproject('boost', required: true).get_variable('boost_dep')
+ boost = boost.as_system('system')
endif
add_project_arguments(
- [
- '-DBOOST_ASIO_DISABLE_THREADS',
- '-DBOOST_ASIO_EXCEPTION_DISABLE',
- '-DBOOST_ASIO_NO_DEPRECATED',
- '-DBOOST_NO_RTTI',
- '-DBOOST_NO_TYPEID',
- ],
- language: 'cpp',
+ [
+ '-DBOOST_ASIO_DISABLE_THREADS',
+ '-DBOOST_ASIO_EXCEPTION_DISABLE',
+ '-DBOOST_ASIO_NO_DEPRECATED',
+ '-DBOOST_NO_RTTI',
+ '-DBOOST_NO_TYPEID',
+ ],
+ language: 'cpp',
)
phosphor_dbus_interfaces = dependency('phosphor-dbus-interfaces')
bindir = get_option('prefix') + '/' + get_option('bindir')
-deps = [
- boost,
- gpiodcxx,
- sdbusplus,
- phosphor_dbus_interfaces,
-]
+deps = [boost, gpiodcxx, sdbusplus, phosphor_dbus_interfaces]
if (get_option('libpeci').allowed())
- peci = dependency('libpeci')
- deps += [
- peci,
- ]
+ peci = dependency('libpeci')
+ deps += [peci]
endif
incs = include_directories('include')
executable(
- 'host-error-monitor',
- 'src/host_error_monitor.cpp',
- include_directories: incs,
- dependencies: deps,
- install: true,
- install_dir: bindir,
+ 'host-error-monitor',
+ 'src/host_error_monitor.cpp',
+ include_directories: incs,
+ dependencies: deps,
+ install: true,
+ install_dir: bindir,
)
subdir('service_files')
if get_option('tests').allowed()
- subdir('tests')
-endif
\ No newline at end of file
+ subdir('tests')
+endif
diff --git a/meson.options b/meson.options
index d08fe21..59dcf5f 100644
--- a/meson.options
+++ b/meson.options
@@ -24,4 +24,4 @@
type: 'feature',
value: 'disabled',
description: 'Use D-Bus Logging interface for reporting',
-)
\ No newline at end of file
+)
diff --git a/service_files/meson.build b/service_files/meson.build
index 92e71e9..71774e9 100644
--- a/service_files/meson.build
+++ b/service_files/meson.build
@@ -1,4 +1,4 @@
install_data(
- 'xyz.openbmc_project.HostErrorMonitor.service',
- install_dir: systemd_system_unit_dir,
-)
\ No newline at end of file
+ 'xyz.openbmc_project.HostErrorMonitor.service',
+ install_dir: systemd_system_unit_dir,
+)
diff --git a/subprojects/packagefiles/boost/meson.build b/subprojects/packagefiles/boost/meson.build
index ba95618..0ae6e6d 100644
--- a/subprojects/packagefiles/boost/meson.build
+++ b/subprojects/packagefiles/boost/meson.build
@@ -1,9 +1,3 @@
-project('boost',
- 'cpp',
- version : '1.82.0',
- license : 'Boost'
-)
+project('boost', 'cpp', version: '1.82.0', license: 'Boost')
-boost_dep = declare_dependency(
- include_directories : include_directories('.'),
-)
+boost_dep = declare_dependency(include_directories: include_directories('.'))
diff --git a/tests/meson.build b/tests/meson.build
index 1fce748..a18688d 100644
--- a/tests/meson.build
+++ b/tests/meson.build
@@ -32,12 +32,8 @@
'../src/host_error_monitor.cpp',
cpp_args: '-DUNIT_TEST',
include_directories: incs,
- dependencies: deps
- + [
- gtest_dep,
- gmock_dep,
- ],
+ dependencies: deps + [gtest_dep, gmock_dep],
),
)
endforeach
-endif
\ No newline at end of file
+endif