From 62578eccf91387dccc6b185bf3063d3f4a496466 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Niklas=20S=C3=B6derlund?= Date: Wed, 26 May 2021 10:05:32 +0200 Subject: libcamera: Add libcamera_generated_ipa_headers as a dependency for libcamera_dep MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 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 whack-a-mole add the generated IPA headers to libcamera_dep. Suggested-by: Laurent Pinchart Signed-off-by: Niklas Söderlund Reviewed-by: Umang Jain Reviewed-by: Laurent Pinchart --- src/libcamera/meson.build | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/src/libcamera/meson.build b/src/libcamera/meson.build index cc2b8669..7e19a177 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 external 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) -- cgit v1.2.1