meson: reformat with meson formatter
Apply the `meson format` results.
Change-Id: Ia02e00493fe1b5a305e23b5761f42cc830f702ea
Signed-off-by: Patrick Williams <patrick@stwcx.xyz>
diff --git a/meson.build b/meson.build
index f36a671..0e449d4 100644
--- a/meson.build
+++ b/meson.build
@@ -1,6 +1,7 @@
project(
- 'phosphor-net-ipmid', 'cpp',
- version : '1.0.0',
+ 'phosphor-net-ipmid',
+ 'cpp',
+ version: '1.0.0',
meson_version: '>=1.1.1',
default_options: [
'warning_level=3',
@@ -8,16 +9,14 @@
'cpp_std=c++23',
'buildtype=debugoptimized',
'b_lto=true',
- ]
+ ],
)
conf_data = configuration_data()
conf_data.set('RMCP_PING', get_option('rmcp_ping').allowed())
conf_data.set('PAM_AUTHENTICATE', get_option('pam_authenticate').allowed())
-configure_file(output: 'config.h',
- configuration: conf_data
-)
+configure_file(output: 'config.h', configuration: conf_data)
sdbusplus_dep = dependency('sdbusplus')
phosphor_dbus_interfaces_dep = dependency('phosphor-dbus-interfaces')
@@ -37,14 +36,17 @@
endif
add_project_arguments(
- cpp.get_supported_arguments([
- '-DBOOST_ERROR_CODE_HEADER_ONLY',
- '-DBOOST_SYSTEM_NO_DEPRECATED',
- '-DBOOST_COROUTINES_NO_DEPRECATION_WARNING',
- '-DBOOST_ASIO_DISABLE_THREADS',
- '-DBOOST_ALL_NO_LIB',
- ]),
- language : 'cpp')
+ cpp.get_supported_arguments(
+ [
+ '-DBOOST_ERROR_CODE_HEADER_ONLY',
+ '-DBOOST_SYSTEM_NO_DEPRECATED',
+ '-DBOOST_COROUTINES_NO_DEPRECATION_WARNING',
+ '-DBOOST_ASIO_DISABLE_THREADS',
+ '-DBOOST_ALL_NO_LIB',
+ ],
+ ),
+ language: 'cpp',
+)
deps = [
cli11_dep,
@@ -89,25 +91,30 @@
include_directories: ['command', 'sol'],
dependencies: deps,
install: true,
- install_dir: get_option('bindir')
+ install_dir: get_option('bindir'),
)
systemd = dependency('systemd')
systemd_system_unit_dir = systemd.get_variable(
- 'systemdsystemunitdir',
- pkgconfig_define: ['prefix', get_option('prefix')])
+ 'systemdsystemunitdir',
+ pkgconfig_define: ['prefix', get_option('prefix')],
+)
-configure_file(input: 'phosphor-ipmi-net@.service',
- output: 'phosphor-ipmi-net@.service',
- copy: true,
- install_dir: systemd_system_unit_dir)
+configure_file(
+ input: 'phosphor-ipmi-net@.service',
+ output: 'phosphor-ipmi-net@.service',
+ copy: true,
+ install_dir: systemd_system_unit_dir,
+)
-configure_file(input: 'phosphor-ipmi-net@.socket',
- output: 'phosphor-ipmi-net@.socket',
- copy: true,
- install_dir: systemd_system_unit_dir)
+configure_file(
+ input: 'phosphor-ipmi-net@.socket',
+ output: 'phosphor-ipmi-net@.socket',
+ copy: true,
+ install_dir: systemd_system_unit_dir,
+)
build_tests = get_option('tests')
if build_tests.allowed()
- subdir('test')
+ subdir('test')
endif
diff --git a/meson.options b/meson.options
index bad5e62..6f9cbaa 100644
--- a/meson.options
+++ b/meson.options
@@ -1,20 +1,15 @@
-option(
- 'tests',
- type : 'feature',
- value: 'enabled',
- description : 'Build tests'
-)
+option('tests', type: 'feature', value: 'enabled', description: 'Build tests')
option(
'rmcp_ping',
- type : 'feature',
+ type: 'feature',
value: 'enabled',
- description : 'Enable RMCP Ping support'
+ description: 'Enable RMCP Ping support',
)
option(
'pam_authenticate',
- type : 'feature',
+ type: 'feature',
value: 'enabled',
- description : 'Enable Pam Authenticate'
+ description: 'Enable Pam Authenticate',
)
diff --git a/test/meson.build b/test/meson.build
index 34f8c32..6fcfd04 100644
--- a/test/meson.build
+++ b/test/meson.build
@@ -8,34 +8,31 @@
dependency('threads'),
gtest_proj.dependency('gtest'),
gtest_proj.dependency('gtest_main'),
- ]
+ ],
)
gmock_dep = gtest_proj.dependency('gmock')
- else
+ else
assert(
not get_option('tests').enabled(),
- 'Googletest is required if tests are enabled'
+ 'Googletest is required if tests are enabled',
)
- endif
+ endif
endif
-test_sources = [
- '../integrity_algo.cpp',
- '../crypt_algo.cpp',
-]
+test_sources = ['../integrity_algo.cpp', '../crypt_algo.cpp']
-tests = [
- 'cipher.cpp',
-]
+tests = ['cipher.cpp']
foreach t : tests
- test(t, executable(t.underscorify(), t,
- test_sources,
- include_directories: ['..'],
- dependencies: [
- gtest_dep,
- gmock_dep,
- libcrypto_dep,
- ]),
- workdir: meson.current_source_dir())
-endforeach
\ No newline at end of file
+ test(
+ t,
+ executable(
+ t.underscorify(),
+ t,
+ test_sources,
+ include_directories: ['..'],
+ dependencies: [gtest_dep, gmock_dep, libcrypto_dep],
+ ),
+ workdir: meson.current_source_dir(),
+ )
+endforeach