diff options
| author | Niklas Söderlund <niklas.soderlund@ragnatech.se> | 2021-05-26 10:05:32 +0200 |
|---|---|---|
| committer | Niklas Söderlund <niklas.soderlund@ragnatech.se> | 2021-06-04 19:25:59 +0200 |
| commit | 62578eccf91387dccc6b185bf3063d3f4a496466 (patch) | |
| tree | e1878c439b6d5fa07dd7d7b613551f430a3e30a1 | |
| parent | 388c4392c1527c7f7b485480496a1d4399c2ea9e (diff) | |
libcamera: Add libcamera_generated_ipa_headers as a dependency for libcamera_dep
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 <laurent.pinchart@ideasonboard.com>
Signed-off-by: Niklas Söderlund <niklas.soderlund@ragnatech.se>
Reviewed-by: Umang Jain <umang.jain@ideasonboard.com>
Reviewed-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
| -rw-r--r-- | src/libcamera/meson.build | 7 |
1 files changed, 7 insertions, 0 deletions
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) |