[libcamera-devel] [PATCH] libcamera: Add libcamera_generated_ipa_headers as a dependency for libcamera_dep

Niklas Söderlund niklas.soderlund at ragnatech.se
Fri May 28 15:18:27 CEST 2021


Some external components such as the unit tests include headers
generated for the IPA's. This is not fully described in meson for each
external component which results in one or more races in the build
system. Instead of playing wack-a-mole add the generated IPA headers to
libcamera_dep.

Suggested-by: Laurent Pinchart <laurent.pinchart at ideasonboard.com>
Signed-off-by: Niklas Söderlund <niklas.soderlund at ragnatech.se>
---
 src/libcamera/meson.build | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/src/libcamera/meson.build b/src/libcamera/meson.build
index cc2b8669d1d9900a..ca67a783356c930f 100644
--- a/src/libcamera/meson.build
+++ b/src/libcamera/meson.build
@@ -155,9 +155,16 @@ libcamera = shared_library('camera',
                            build_rpath : '/',
                            dependencies : libcamera_deps)
 
+# TODO Drop libcamera_generated_ipa_headers from libcamera_dep as libcamera_dep
+# is supposed to model the dependencies required for usage of the public API,
+# not the internal API. It is needed as as some extenral components such as the
+# unit tests make use of the generated headers and this creates a race in the
+# build.
+
 libcamera_dep = declare_dependency(sources : [
                                        libcamera_ipa_headers,
                                        libcamera_public_headers,
+                                       libcamera_generated_ipa_headers,
                                    ],
                                    include_directories : libcamera_includes,
                                    link_with : libcamera)
-- 
2.31.1



More information about the libcamera-devel mailing list