meson: reformat with meson formatter
Apply the `meson format` results.
Change-Id: I024144165b08c727dd9621842f1a497830247155
Signed-off-by: Patrick Williams <patrick@stwcx.xyz>
diff --git a/example/meson.build b/example/meson.build
index 8a63e8e..04edf74 100644
--- a/example/meson.build
+++ b/example/meson.build
@@ -1,21 +1,18 @@
-executable(
- 'list-users',
- 'list-users.cpp',
- dependencies: sdbusplus_dep,
-)
+executable('list-users', 'list-users.cpp', dependencies: sdbusplus_dep)
has_asio = meson.get_compiler('cpp').has_header_symbol(
- 'boost/asio.hpp',
- 'boost::asio::io_context',
- required: false)
+ 'boost/asio.hpp',
+ 'boost::asio::io_context',
+ required: false,
+)
asio_dep = sdbusplus_dep
if not has_asio
- asio_dep = disabler()
+ asio_dep = disabler()
endif
assert(
not get_option('examples').allowed() or has_asio,
- 'Boost is required when examples are enabled'
+ 'Boost is required when examples are enabled',
)
executable(
@@ -35,14 +32,10 @@
executable(
'coroutine-example',
'coroutine-example.cpp',
- dependencies: [ sdbusplus_dep ],
+ dependencies: [sdbusplus_dep],
)
-executable(
- 'register-property',
- 'register-property.cpp',
- dependencies: asio_dep,
-)
+executable('register-property', 'register-property.cpp', dependencies: asio_dep)
executable(
'get-all-properties',
diff --git a/meson.build b/meson.build
index e25c24b..bc5a837 100644
--- a/meson.build
+++ b/meson.build
@@ -1,11 +1,14 @@
-project('sdbusplus', 'cpp', 'c',
+project(
+ 'sdbusplus',
+ 'cpp',
+ 'c',
default_options: [
- 'buildtype=debugoptimized',
- 'cpp_std=c++23',
- 'warning_level=3',
- 'werror=true',
- 'tests=' + (meson.is_subproject() ? 'disabled' : 'auto'),
- 'examples=' + (meson.is_subproject() ? 'disabled' : 'auto'),
+ 'buildtype=debugoptimized',
+ 'cpp_std=c++23',
+ 'warning_level=3',
+ 'werror=true',
+ 'tests=' + (meson.is_subproject() ? 'disabled' : 'auto'),
+ 'examples=' + (meson.is_subproject() ? 'disabled' : 'auto'),
],
version: '1.0.0',
meson_version: '>=1.1.1',
@@ -15,18 +18,21 @@
nlohmann_json_dep = dependency('nlohmann_json', include_type: 'system')
python = import('python')
-python_bin = python.find_installation('python3', modules:['inflection', 'yaml', 'mako'])
+python_bin = python.find_installation(
+ 'python3',
+ modules: ['inflection', 'yaml', 'mako'],
+)
if not python_bin.found()
- error('No valid python3 installation found')
+ error('No valid python3 installation found')
endif
root_inc = include_directories('include')
libsdbusplus_src = files(
'src/async/context.cpp',
- 'src/async/match.cpp',
'src/async/fdio.cpp',
+ 'src/async/match.cpp',
'src/bus.cpp',
'src/bus/match.cpp',
'src/event.cpp',
@@ -41,10 +47,7 @@
'sdbusplus',
libsdbusplus_src,
include_directories: root_inc,
- dependencies: [
- libsystemd_pkg,
- nlohmann_json_dep
- ],
+ dependencies: [libsystemd_pkg, nlohmann_json_dep],
version: meson.project_version(),
install: true,
)
@@ -59,16 +62,13 @@
boost_dep = declare_dependency(
dependencies: dependency('boost', required: false),
- compile_args: boost_compile_args)
+ compile_args: boost_compile_args,
+)
sdbusplus_dep = declare_dependency(
include_directories: root_inc,
link_with: libsdbusplus,
- dependencies: [
- boost_dep,
- libsystemd_pkg,
- nlohmann_json_dep,
- ],
+ dependencies: [boost_dep, libsystemd_pkg, nlohmann_json_dep],
)
should_generate_cpp = true
@@ -78,10 +78,10 @@
subdir('tools')
if get_option('examples').allowed()
- subdir('example')
+ subdir('example')
endif
if get_option('tests').allowed()
- subdir('test')
+ subdir('test')
endif
install_subdir(
diff --git a/test/meson.build b/test/meson.build
index 2329e31..ca7ee4c 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
@@ -46,18 +46,14 @@
executable(
'test-' + t.underscorify(),
t + '.cpp',
- dependencies: [
- gtest_dep,
- gmock_dep,
- sdbusplus_dep,
- ],
- )
+ dependencies: [gtest_dep, gmock_dep, sdbusplus_dep],
+ ),
)
endforeach
assert(
not get_option('tests').allowed() or boost_dep.found(),
- 'Boost is required when tests are enabled'
+ 'Boost is required when tests are enabled',
)
test(
@@ -65,13 +61,8 @@
executable(
'test-bus_aio',
'bus/aio.cpp',
- dependencies: [
- boost_dep,
- gmock_dep,
- gtest_dep,
- sdbusplus_dep,
- ],
- )
+ dependencies: [boost_dep, gmock_dep, gtest_dep, sdbusplus_dep],
+ ),
)
test(
@@ -80,10 +71,7 @@
'test-vtable',
'vtable/vtable.cpp',
'vtable/vtable_c.c',
- dependencies: [
- gtest_dep,
- sdbusplus_dep,
- ],
+ dependencies: [gtest_dep, sdbusplus_dep],
),
)
@@ -92,29 +80,28 @@
server_test_pre = declare_dependency(
include_directories: include_directories('gen'),
- dependencies: sdbusplus_dep)
+ dependencies: sdbusplus_dep,
+)
server_test_lib = static_library(
'server-test',
generated_sources,
implicit_include_directories: false,
- dependencies: server_test_pre)
+ dependencies: server_test_pre,
+)
server_test_dep = declare_dependency(
- sources: generated_headers,
- link_with: server_test_lib,
- dependencies: server_test_pre)
+ sources: generated_headers,
+ link_with: server_test_lib,
+ dependencies: server_test_pre,
+)
test(
'test-server',
executable(
'test-server',
'server/object.cpp',
- dependencies: [
- gmock_dep,
- gtest_dep,
- server_test_dep,
- ],
+ dependencies: [gmock_dep, gtest_dep, server_test_dep],
),
)
@@ -123,10 +110,6 @@
executable(
'test-server-message-variant',
'server/message_variant.cpp',
- dependencies: [
- gmock_dep,
- gtest_dep,
- server_test_dep,
- ],
+ dependencies: [gmock_dep, gtest_dep, server_test_dep],
),
)
diff --git a/tools/meson.build b/tools/meson.build
index 4c33b32..1059be8 100644
--- a/tools/meson.build
+++ b/tools/meson.build
@@ -1,58 +1,58 @@
sdbusplusplus_depfiles = files(
- 'sdbus++',
- 'sdbusplus/__init__.py',
- 'sdbusplus/enum.py',
- 'sdbusplus/error.py',
- 'sdbusplus/event.py',
- 'sdbusplus/interface.py',
- 'sdbusplus/main.py',
- 'sdbusplus/method.py',
- 'sdbusplus/namedelement.py',
- 'sdbusplus/path.py',
- 'sdbusplus/property.py',
- 'sdbusplus/renderer.py',
- 'sdbusplus/servicename.py',
- 'sdbusplus/signal.py',
- 'sdbusplus/schemas/events.schema.yaml',
- 'sdbusplus/templates/error.cpp.mako',
- 'sdbusplus/templates/error.hpp.mako',
- 'sdbusplus/templates/error.md.mako',
- 'sdbusplus/templates/event.cpp.mako',
- 'sdbusplus/templates/event.hpp.mako',
- 'sdbusplus/templates/event.md.mako',
- 'sdbusplus/templates/events.cpp.mako',
- 'sdbusplus/templates/events.hpp.mako',
- 'sdbusplus/templates/events.md.mako',
- 'sdbusplus/templates/interface.aserver.hpp.mako',
- 'sdbusplus/templates/interface.client.hpp.mako',
- 'sdbusplus/templates/interface.common.hpp.mako',
- 'sdbusplus/templates/interface.md.mako',
- 'sdbusplus/templates/interface.server.cpp.mako',
- 'sdbusplus/templates/interface.server.hpp.mako',
- 'sdbusplus/templates/method.aserver.callback.hpp.mako',
- 'sdbusplus/templates/method.aserver.tag.hpp.mako',
- 'sdbusplus/templates/method.aserver.typeid.hpp.mako',
- 'sdbusplus/templates/method.aserver.vtable.hpp.mako',
- 'sdbusplus/templates/method.client.hpp.mako',
- 'sdbusplus/templates/method.md.mako',
- 'sdbusplus/templates/method.prototype.hpp.mako',
- 'sdbusplus/templates/method.server.vtable.cpp.mako',
- 'sdbusplus/templates/property.md.mako',
- 'sdbusplus/templates/property.aserver.callback.hpp.mako',
- 'sdbusplus/templates/property.aserver.get.hpp.mako',
- 'sdbusplus/templates/property.aserver.set.hpp.mako',
- 'sdbusplus/templates/property.aserver.tag.hpp.mako',
- 'sdbusplus/templates/property.aserver.typeid.hpp.mako',
- 'sdbusplus/templates/property.aserver.vtable.hpp.mako',
- 'sdbusplus/templates/property.client.hpp.mako',
- 'sdbusplus/templates/property.server.cpp.mako',
- 'sdbusplus/templates/property.server.vtable.cpp.mako',
- 'sdbusplus/templates/signal.md.mako',
- 'sdbusplus/templates/signal.aserver.emit.hpp.mako',
- 'sdbusplus/templates/signal.aserver.typeid.hpp.mako',
- 'sdbusplus/templates/signal.aserver.vtable.hpp.mako',
- 'sdbusplus/templates/signal.prototype.hpp.mako',
- 'sdbusplus/templates/signal.server.vtable.cpp.mako',
+ 'sdbus++',
+ 'sdbusplus/__init__.py',
+ 'sdbusplus/enum.py',
+ 'sdbusplus/error.py',
+ 'sdbusplus/event.py',
+ 'sdbusplus/interface.py',
+ 'sdbusplus/main.py',
+ 'sdbusplus/method.py',
+ 'sdbusplus/namedelement.py',
+ 'sdbusplus/path.py',
+ 'sdbusplus/property.py',
+ 'sdbusplus/renderer.py',
+ 'sdbusplus/schemas/events.schema.yaml',
+ 'sdbusplus/servicename.py',
+ 'sdbusplus/signal.py',
+ 'sdbusplus/templates/error.cpp.mako',
+ 'sdbusplus/templates/error.hpp.mako',
+ 'sdbusplus/templates/error.md.mako',
+ 'sdbusplus/templates/event.cpp.mako',
+ 'sdbusplus/templates/event.hpp.mako',
+ 'sdbusplus/templates/event.md.mako',
+ 'sdbusplus/templates/events.cpp.mako',
+ 'sdbusplus/templates/events.hpp.mako',
+ 'sdbusplus/templates/events.md.mako',
+ 'sdbusplus/templates/interface.aserver.hpp.mako',
+ 'sdbusplus/templates/interface.client.hpp.mako',
+ 'sdbusplus/templates/interface.common.hpp.mako',
+ 'sdbusplus/templates/interface.md.mako',
+ 'sdbusplus/templates/interface.server.cpp.mako',
+ 'sdbusplus/templates/interface.server.hpp.mako',
+ 'sdbusplus/templates/method.aserver.callback.hpp.mako',
+ 'sdbusplus/templates/method.aserver.tag.hpp.mako',
+ 'sdbusplus/templates/method.aserver.typeid.hpp.mako',
+ 'sdbusplus/templates/method.aserver.vtable.hpp.mako',
+ 'sdbusplus/templates/method.client.hpp.mako',
+ 'sdbusplus/templates/method.md.mako',
+ 'sdbusplus/templates/method.prototype.hpp.mako',
+ 'sdbusplus/templates/method.server.vtable.cpp.mako',
+ 'sdbusplus/templates/property.aserver.callback.hpp.mako',
+ 'sdbusplus/templates/property.aserver.get.hpp.mako',
+ 'sdbusplus/templates/property.aserver.set.hpp.mako',
+ 'sdbusplus/templates/property.aserver.tag.hpp.mako',
+ 'sdbusplus/templates/property.aserver.typeid.hpp.mako',
+ 'sdbusplus/templates/property.aserver.vtable.hpp.mako',
+ 'sdbusplus/templates/property.client.hpp.mako',
+ 'sdbusplus/templates/property.md.mako',
+ 'sdbusplus/templates/property.server.cpp.mako',
+ 'sdbusplus/templates/property.server.vtable.cpp.mako',
+ 'sdbusplus/templates/signal.aserver.emit.hpp.mako',
+ 'sdbusplus/templates/signal.aserver.typeid.hpp.mako',
+ 'sdbusplus/templates/signal.aserver.vtable.hpp.mako',
+ 'sdbusplus/templates/signal.md.mako',
+ 'sdbusplus/templates/signal.prototype.hpp.mako',
+ 'sdbusplus/templates/signal.server.vtable.cpp.mako',
)
meson.override_find_program('sdbus++', files('sdbus++'))
sdbusplusplus_prog = find_program('sdbus++', native: true)