meson: reformat with meson formatter
Apply the `meson format` results.
Change-Id: I801388ee554b6112aaabaa763873d68d1a4f5fb7
Signed-off-by: Patrick Williams <patrick@stwcx.xyz>
diff --git a/meson.build b/meson.build
index 42d0d28..7e75f83 100644
--- a/meson.build
+++ b/meson.build
@@ -1,19 +1,26 @@
project(
- 'phosphor-snmp', 'cpp',
- version : '1.0.0',
+ 'phosphor-snmp',
+ 'cpp',
+ version: '1.0.0',
meson_version: '>=1.1.1',
default_options: [
'warning_level=3',
'werror=true',
'cpp_std=c++23',
'buildtype=debugoptimized',
- ]
+ ],
)
conf_data = configuration_data()
conf_data.set_quoted('BUSNAME_NETWORK_SNMP', 'xyz.openbmc_project.Network.SNMP')
-conf_data.set_quoted('OBJ_NETWORK_SNMP', '/xyz/openbmc_project/network/snmp/manager')
-conf_data.set_quoted('SNMP_CONF_PERSIST_PATH', '/var/lib/phosphor-snmp/managers/')
+conf_data.set_quoted(
+ 'OBJ_NETWORK_SNMP',
+ '/xyz/openbmc_project/network/snmp/manager',
+)
+conf_data.set_quoted(
+ 'SNMP_CONF_PERSIST_PATH',
+ '/var/lib/phosphor-snmp/managers/',
+)
conf_data.set('CLASS_VERSION', 1)
sdbusplus_dep = dependency('sdbusplus')
@@ -31,14 +38,18 @@
'cereal/cereal.hpp',
'cereal::specialize',
dependencies: cereal_dep,
- required: false)
+ required: false,
+)
if not has_cereal
cereal_opts = import('cmake').subproject_options()
- cereal_opts.add_cmake_defines({'BUILD_TESTS': 'OFF', 'SKIP_PERFORMANCE_COMPARISON': 'ON'})
+ cereal_opts.add_cmake_defines(
+ {'BUILD_TESTS': 'OFF', 'SKIP_PERFORMANCE_COMPARISON': 'ON'},
+ )
cereal_proj = import('cmake').subproject(
'cereal',
options: cereal_opts,
- required: false)
+ required: false,
+ )
assert(cereal_proj.found(), 'cereal is required')
cereal_dep = cereal_proj.dependency('cereal')
endif
@@ -61,9 +72,7 @@
'snmp_serialize.cpp',
]
-configure_file(output: 'config.h',
- configuration: conf_data
-)
+configure_file(output: 'config.h', configuration: conf_data)
executable(
'phosphor-network-snmpconf',
@@ -71,7 +80,7 @@
implicit_include_directories: true,
dependencies: deps,
install: true,
- install_dir: get_option('bindir')
+ install_dir: get_option('bindir'),
)
libsnmp_deps = [
@@ -82,10 +91,7 @@
libcrypto_dep,
]
-libsnmp_sources = files(
- 'snmp_notification.cpp',
- 'snmp_util.cpp',
-)
+libsnmp_sources = files('snmp_notification.cpp', 'snmp_util.cpp')
libsnmp_lib = library(
'snmp',
@@ -110,13 +116,9 @@
description: 'Phosphor snmp utilities',
)
-install_headers(
- 'snmp.hpp',
- 'snmp_notification.hpp',
- subdir: '.',
-)
+install_headers('snmp.hpp', 'snmp_notification.hpp', subdir: '.')
build_tests = get_option('tests')
if not build_tests.disabled()
- subdir('test')
+ subdir('test')
endif
diff --git a/meson.options b/meson.options
index f1c7bd8..0fc2767 100644
--- a/meson.options
+++ b/meson.options
@@ -1 +1 @@
-option('tests', type : 'feature', description : 'Build tests')
\ No newline at end of file
+option('tests', type: 'feature', description: 'Build tests')
diff --git a/test/meson.build b/test/meson.build
index 728d641..aa44862 100644
--- a/test/meson.build
+++ b/test/meson.build
@@ -8,40 +8,42 @@
dependency('threads'),
gtest_proj.dependency('gtest'),
gtest_proj.dependency('gtest_main'),
- ]
+ ],
)
gmock_dep = gtest_proj.dependency('gmock')
- else
+ else
assert(
not get_option('tests').allowed(),
- 'Googletest is required if tests are enabled'
+ 'Googletest is required if tests are enabled',
)
- endif
+ endif
endif
test_sources = [
- '../snmp_conf_manager.cpp',
- '../snmp_client.cpp',
- '../snmp_serialize.cpp',
- '../snmp_util.cpp',
+ '../snmp_conf_manager.cpp',
+ '../snmp_client.cpp',
+ '../snmp_serialize.cpp',
+ '../snmp_util.cpp',
]
tests = [
- 'test_error_notification.cpp',
- 'test_snmp_conf_manager.cpp',
- 'test_snmp_util.cpp',
- 'test_snmp_serialize.cpp',
- 'test_snmp_client.cpp',
+ 'test_error_notification.cpp',
+ 'test_snmp_conf_manager.cpp',
+ 'test_snmp_util.cpp',
+ 'test_snmp_serialize.cpp',
+ 'test_snmp_client.cpp',
]
foreach t : tests
- test(t, executable(t.underscorify(), t,
- test_sources,
- include_directories: ['..'],
- dependencies: [
- gtest_dep,
- gmock_dep,
- deps
- ]),
- workdir: meson.current_source_dir())
+ test(
+ t,
+ executable(
+ t.underscorify(),
+ t,
+ test_sources,
+ include_directories: ['..'],
+ dependencies: [gtest_dep, gmock_dep, deps],
+ ),
+ workdir: meson.current_source_dir(),
+ )
endforeach