Skip to content

Commit

Permalink
meson: apply meson format
Browse files Browse the repository at this point in the history
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 <[email protected]>
  • Loading branch information
pointbazaar committed Feb 27, 2025
1 parent 7fe19f4 commit 192bb5d
Show file tree
Hide file tree
Showing 3 changed files with 23 additions and 42 deletions.
22 changes: 9 additions & 13 deletions common/meson.build
Original file line number Diff line number Diff line change
@@ -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],
)
6 changes: 3 additions & 3 deletions meson.build
Original file line number Diff line number Diff line change
Expand Up @@ -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

37 changes: 11 additions & 26 deletions test/common/exampledevice/meson.build
Original file line number Diff line number Diff line change
@@ -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],
)

0 comments on commit 192bb5d

Please sign in to comment.