meson: reformat with meson formatter
Apply the `meson format` results.
Change-Id: Id3da51b0ab2cd90f7bb79bd7b613b2226672a802
Signed-off-by: Patrick Williams <patrick@stwcx.xyz>
diff --git a/subprojects/metrics-ipmi-blobs/meson.build b/subprojects/metrics-ipmi-blobs/meson.build
index 331ad86..ccf514c 100644
--- a/subprojects/metrics-ipmi-blobs/meson.build
+++ b/subprojects/metrics-ipmi-blobs/meson.build
@@ -13,99 +13,109 @@
# limitations under the License.
project(
- 'metrics-ipmi-blobs',
- ['cpp', 'c'],
- version: '0.1',
- default_options: [
- 'warning_level=3',
- 'werror=true',
- 'cpp_std=c++23',
- 'c_std=c18',
- 'tests=' + (meson.is_subproject() ? 'disabled' : 'auto'),
- ],
+ 'metrics-ipmi-blobs',
+ ['cpp', 'c'],
+ version: '0.1',
+ default_options: [
+ 'warning_level=3',
+ 'werror=true',
+ 'cpp_std=c++23',
+ 'c_std=c18',
+ 'tests=' + (meson.is_subproject() ? 'disabled' : 'auto'),
+ ],
)
nanopb = find_program('nanopb_generator.py', native: true, required: false)
if not nanopb.found()
- nanopb_opts = import('cmake').subproject_options()
- nanopb_opts.add_cmake_defines({'BUILD_SHARED_LIBS': 'ON'})
- nanopb_proj = import('cmake').subproject('nanopb', options: nanopb_opts)
- nanopb = find_program(meson.global_source_root() + '/subprojects/nanopb/generator/nanopb_generator.py', native: true)
- nanopb_dep = nanopb_proj.dependency('protobuf_nanopb')
+ nanopb_opts = import('cmake').subproject_options()
+ nanopb_opts.add_cmake_defines({'BUILD_SHARED_LIBS': 'ON'})
+ nanopb_proj = import('cmake').subproject('nanopb', options: nanopb_opts)
+ nanopb = find_program(
+ meson.global_source_root() + '/subprojects/nanopb/generator/nanopb_generator.py',
+ native: true,
+ )
+ nanopb_dep = nanopb_proj.dependency('protobuf_nanopb')
else
- nanopb_dep = meson.get_compiler('cpp').find_library('protobuf-nanopb')
+ nanopb_dep = meson.get_compiler('cpp').find_library('protobuf-nanopb')
endif
nanopb_kwargs = {
- 'output': [
- '@BASENAME@.pb.n.h',
- '@BASENAME@.pb.n.c',
- ],
- 'command': [
- nanopb,
- '-q',
- '-s', 'packed_struct:0',
- '-H.n.h',
- '-S.n.c',
- '-I' + import('fs').relative_to(meson.current_source_dir(), meson.global_build_root()),
- '-D' + import('fs').relative_to(meson.current_build_dir(), meson.global_build_root()),
- '@INPUT@',
- ],
+ 'output': ['@BASENAME@.pb.n.h', '@BASENAME@.pb.n.c'],
+ 'command': [
+ nanopb,
+ '-q',
+ '-s',
+ 'packed_struct:0',
+ '-H.n.h',
+ '-S.n.c',
+ '-I' + import('fs').relative_to(
+ meson.current_source_dir(),
+ meson.global_build_root(),
+ ),
+ '-D' + import('fs').relative_to(
+ meson.current_build_dir(),
+ meson.global_build_root(),
+ ),
+ '@INPUT@',
+ ],
}
tgt = custom_target(
- 'metricblob.pb.n.hc',
- input: 'metricblob.proto',
- kwargs: nanopb_kwargs)
+ 'metricblob.pb.n.hc',
+ input: 'metricblob.proto',
+ kwargs: nanopb_kwargs,
+)
metrics_nanopb_hdr = tgt[0]
metrics_nanopb_src = tgt[1]
metrics_nanopb_pre = declare_dependency(
- include_directories: include_directories('.'),
- sources: metrics_nanopb_hdr,
- dependencies: [
- nanopb_dep,
- ])
+ include_directories: include_directories('.'),
+ sources: metrics_nanopb_hdr,
+ dependencies: [nanopb_dep],
+)
metrics_nanopb_lib = static_library(
- 'metrics_nanopb',
- metrics_nanopb_src,
- implicit_include_directories: false,
- dependencies: metrics_nanopb_pre)
+ 'metrics_nanopb',
+ metrics_nanopb_src,
+ implicit_include_directories: false,
+ dependencies: metrics_nanopb_pre,
+)
metrics_nanopb_dep = declare_dependency(
- dependencies: metrics_nanopb_pre,
- link_with: metrics_nanopb_lib)
+ dependencies: metrics_nanopb_pre,
+ link_with: metrics_nanopb_lib,
+)
pre = declare_dependency(
- include_directories: include_directories('.'),
- dependencies: [
- metrics_nanopb_dep,
- dependency('phosphor-logging'),
- dependency('phosphor-ipmi-blobs'),
- dependency('sdbusplus'),
- ])
+ include_directories: include_directories('.'),
+ dependencies: [
+ metrics_nanopb_dep,
+ dependency('phosphor-logging'),
+ dependency('phosphor-ipmi-blobs'),
+ dependency('sdbusplus'),
+ ],
+)
lib = static_library(
- 'metricsblob',
- 'util.cpp',
- 'handler.cpp',
- 'metric.cpp',
- implicit_include_directories: false,
- dependencies: pre)
+ 'metricsblob',
+ 'util.cpp',
+ 'handler.cpp',
+ 'metric.cpp',
+ implicit_include_directories: false,
+ dependencies: pre,
+)
-dep = declare_dependency(
- dependencies: pre,
- link_with: lib)
+dep = declare_dependency(dependencies: pre, link_with: lib)
shared_module(
- 'metricsblob',
- 'main.cpp',
- dependencies: dep,
- implicit_include_directories: false,
- install: true,
- install_dir: get_option('libdir') / 'blob-ipmid')
+ 'metricsblob',
+ 'main.cpp',
+ dependencies: dep,
+ implicit_include_directories: false,
+ install: true,
+ install_dir: get_option('libdir') / 'blob-ipmid',
+)
if get_option('tests').allowed()
- subdir('test')
+ subdir('test')
endif
diff --git a/subprojects/metrics-ipmi-blobs/test/meson.build b/subprojects/metrics-ipmi-blobs/test/meson.build
index 1803544..435ae46 100644
--- a/subprojects/metrics-ipmi-blobs/test/meson.build
+++ b/subprojects/metrics-ipmi-blobs/test/meson.build
@@ -1,32 +1,36 @@
gtest = dependency('gtest', main: true, disabler: true, required: false)
gmock = dependency('gmock', disabler: true, required: false)
if not gtest.found() or not gmock.found()
- gtest_proj = import('cmake').subproject(
- 'googletest',
- cmake_options: [
- '-DCMAKE_CXX_FLAGS=-Wno-pedantic',
- ],
- required: false)
- if gtest_proj.found()
- gtest = declare_dependency(
- dependencies: [
- dependency('threads'),
- gtest_proj.dependency('gtest'),
- gtest_proj.dependency('gtest_main'),
- ])
- gmock = gtest_proj.dependency('gmock')
- else
- assert(not get_option('tests').allowed(), 'Googletest is required')
- endif
+ gtest_proj = import('cmake').subproject(
+ 'googletest',
+ cmake_options: ['-DCMAKE_CXX_FLAGS=-Wno-pedantic'],
+ required: false,
+ )
+ if gtest_proj.found()
+ gtest = declare_dependency(
+ dependencies: [
+ dependency('threads'),
+ gtest_proj.dependency('gtest'),
+ gtest_proj.dependency('gtest_main'),
+ ],
+ )
+ gmock = gtest_proj.dependency('gmock')
+ else
+ assert(not get_option('tests').allowed(), 'Googletest is required')
+ endif
endif
-tests = [
- 'util_test',
-]
+tests = ['util_test']
foreach t : tests
- test(t, executable(t.underscorify(), t + '.cpp',
- implicit_include_directories: false,
- dependencies: [gtest, gmock, dep]))
+ test(
+ t,
+ executable(
+ t.underscorify(),
+ t + '.cpp',
+ implicit_include_directories: false,
+ dependencies: [gtest, gmock, dep],
+ ),
+ )
endforeach