From 192bb5d91075f6dbaa9fd3ecdfc7bf6a0eca38fe Mon Sep 17 00:00:00 2001 From: Alexander Hansen Date: Thu, 27 Feb 2025 11:28:15 +0100 Subject: [PATCH] meson: apply meson format since [1] was merged in openbmc-build-scripts, meson format is required to pass CI. References: [1] https://gerrit.openbmc.org/c/openbmc/openbmc-build-scripts/+/77742 Change-Id: I66206066c41dd3d6225855d0530c72f5089a964b Signed-off-by: Alexander Hansen --- common/meson.build | 22 +++++++--------- meson.build | 6 ++--- test/common/exampledevice/meson.build | 37 ++++++++------------------- 3 files changed, 23 insertions(+), 42 deletions(-) diff --git a/common/meson.build b/common/meson.build index 5642b446..73ef76ff 100644 --- a/common/meson.build +++ b/common/meson.build @@ -1,17 +1,13 @@ subdir('pldm') -software_common_lib = static_library('software_common_lib', - 'src/software_manager.cpp', - 'src/device.cpp', - 'src/software_config.cpp', - 'src/software.cpp', - 'src/software_update.cpp', - include_directories: ['.','include/', common_include], - dependencies: [ - pdi_dep, - phosphor_logging_dep, - sdbusplus_dep, - libpldm_dep, - ], +software_common_lib = static_library( + 'software_common_lib', + 'src/software_manager.cpp', + 'src/device.cpp', + 'src/software_config.cpp', + 'src/software.cpp', + 'src/software_update.cpp', + include_directories: ['.', 'include/', common_include], + dependencies: [pdi_dep, phosphor_logging_dep, sdbusplus_dep, libpldm_dep], ) diff --git a/meson.build b/meson.build index 2864764d..f5420ea0 100644 --- a/meson.build +++ b/meson.build @@ -71,12 +71,12 @@ common_include = include_directories('.') common_build = build_tests.allowed() if common_build - libpldm_dep = dependency('libpldm') + libpldm_dep = dependency('libpldm') - subdir('common') + subdir('common') endif if build_tests.allowed() - subdir('test') + subdir('test') endif diff --git a/test/common/exampledevice/meson.build b/test/common/exampledevice/meson.build index eebead17..829f1101 100644 --- a/test/common/exampledevice/meson.build +++ b/test/common/exampledevice/meson.build @@ -1,30 +1,15 @@ -libexampledevice = static_library('example_device', - 'example_device.cpp', - include_directories: ['.', common_include], - dependencies: [ - pdi_dep, - phosphor_logging_dep, - sdbusplus_dep, - libpldm_dep, - ], - link_with: [ - software_common_lib, - ], +libexampledevice = static_library( + 'example_device', + 'example_device.cpp', + include_directories: ['.', common_include], + dependencies: [pdi_dep, phosphor_logging_dep, sdbusplus_dep, libpldm_dep], + link_with: [software_common_lib], ) executable( - 'example-code-updater', - 'example_updater_main.cpp', - include_directories: ['.', common_include], - dependencies: [ - pdi_dep, - phosphor_logging_dep, - sdbusplus_dep, - libpldm_dep, - ], - link_with: [ - libpldmutil, - software_common_lib, - libexampledevice - ], + 'example-code-updater', + 'example_updater_main.cpp', + include_directories: ['.', common_include], + dependencies: [pdi_dep, phosphor_logging_dep, sdbusplus_dep, libpldm_dep], + link_with: [libpldmutil, software_common_lib, libexampledevice], )