commit 26d374835b84adac8a47c8c857aafbb7f894a785
author Christopher Meis <christopher.meis@9elements.com> Tue Apr 29 11:47:07 2025 +0200
committer Jagpal S Gill <paligill@gmail.com> Wed Apr 30 16:15:24 2025 +0000
tree 59cdbf6ce8a96a44f751a94c3659296ce1993182
parent 0ac6478710b1c98ae73e16b41c89c5a3588e4e00

fix: i2cvr-software-update meson.build cleanup for i2c dependency

Change-Id: Ie2f004bcdf672a850888aa089f12ede402f1ed24
Signed-off-by: Christopher Meis <christopher.meis@9elements.com>

common/i2c/meson.build

diff --git a/common/i2c/meson.build b/common/i2c/meson.build
index fd8a702..eb92b88 100644
--- a/common/i2c/meson.build
+++ b/common/i2c/meson.build
@@ -1,7 +1,11 @@
-libi2c_dev = static_library('i2c_dev', 'i2c.cpp', link_args: '-li2c')
-libi2c_inc = include_directories('.')
+libi2c_inc = include_directories('../include/i2c/')
+libi2c_dev = static_library(
+    'i2c_dev',
+    'i2c.cpp',
+    include_directories: libi2c_inc,
+    link_args: '-li2c',
+)
 libi2c_dep = declare_dependency(
-    common_include,
     link_with: libi2c_dev,
     include_directories: libi2c_inc,
     link_args: '-li2c',

common/meson.build

diff --git a/common/meson.build b/common/meson.build
index 6887c38..1e29ae8 100644
--- a/common/meson.build
+++ b/common/meson.build
@@ -9,7 +9,6 @@
     'src/software.cpp',
     'src/software_update.cpp',
     'src/host_power.cpp',
-    'i2c/i2c.cpp',
-    include_directories: ['.', 'include/', 'include/i2c/', common_include],
+    include_directories: ['.', 'include/', common_include],
     dependencies: [pdi_dep, phosphor_logging_dep, sdbusplus_dep, libpldm_dep],
 )