In order to perform things like LTO more easily in
our DPDK applications, we use DPDK as a meson subproject.
Also export includes in order to be usable in this context.
Signed-off-by: Markus Theil <markus.th...@tu-ilmenau.de>
---
drivers/meson.build | 4 ++++
lib/meson.build | 1 +
meson.build | 1 +
3 files changed, 6 insertions(+)
diff --git a/drivers/meson.build b/drivers/meson.build
index 216971f4e2..15ac600768 100644
--- a/drivers/meson.build
+++ b/drivers/meson.build
@@ -174,6 +174,10 @@ foreach subpath:subdirs
install_headers(driver_sdk_headers)
endif
+ if headers.length() > 0
+ dpdk_includes += include_directories(drv_path)
+ endif
+
# generate pmdinfo sources by building a temporary
# lib and then running pmdinfogen on the contents of
# that lib. The final lib reuses the object files and
diff --git a/lib/meson.build b/lib/meson.build
index f858844fa2..85113d0b47 100644
--- a/lib/meson.build
+++ b/lib/meson.build
@@ -190,6 +190,7 @@ foreach l:libraries
libname = 'rte_' + name
includes += include_directories(l)
+ dpdk_includes += include_directories(l)
if developer_mode and is_windows and use_function_versioning
message('@0@: Function versioning is not supported by
Windows.'.format(name))
diff --git a/meson.build b/meson.build
index 1d35a255c3..d1cf039297 100644
--- a/meson.build
+++ b/meson.build
@@ -32,6 +32,7 @@ cc = meson.get_compiler('c')
dpdk_source_root = meson.current_source_dir()
dpdk_build_root = meson.current_build_dir()
dpdk_conf = configuration_data()
+dpdk_includes = []
dpdk_libraries = []
dpdk_static_libraries = []
dpdk_shared_lib_deps = []
--
2.38.0
