[libcamera-devel] [PATCH 14/16] libcamera: Move generated headers to private dep

[Kieran Bingham]

The libcamera_generated_ipa_headers are only a dependency to internal
components, and should not form part of the public API.

Now that we have a private dependency, move the generated headers there,

Signed-off-by: Kieran Bingham <kieran.bingham at ideasonboard.com>
---
 src/libcamera/meson.build | 12 ++++--------
 1 file changed, 4 insertions(+), 8 deletions(-)

diff --git a/src/libcamera/meson.build b/src/libcamera/meson.build
index 64c7475f1a2e..706f44924f65 100644
--- a/src/libcamera/meson.build
+++ b/src/libcamera/meson.build
@@ -131,23 +131,19 @@ libcamera = shared_library('libcamera',
                            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,
                                    dependencies : libcamera_base,
                                    link_with : libcamera)
 
 # Internal dependancy for components and plugins which can use Private APIs
-libcamera_private = declare_dependency(dependencies : [
+libcamera_private = declare_dependency(sources : [
+                                           libcamera_generated_ipa_headers,
+                                       ],
+                                       dependencies : [
                                            libcamera_dep,
                                            libcamera_base_private,
                                        ])
-- 
2.30.2