[libcamera-devel,v3,2/7] include: libcamera: meson: Add control headers to the libcamera_api array

Message ID 20200307211326.26994-3-laurent.pinchart@ideasonboard.com
State Superseded
Headers show
Series
  • Fix race condition and other build issues
Related show

Commit Message

Laurent Pinchart March 7, 2020, 9:13 p.m. UTC
From: Kieran Bingham <kieran.bingham@ideasonboard.com>

The libcamera_api array is meant to contain all the headers from the
libcamera public API, for the purpose of generating documentation and
creating the libcamera_dep dependency. The generated control headers are
part of the libcamera public API, and used to be included in the
libcamera_api array until commit f870591a9bf5 ("libcamera: properties:
Add location property") inadvertently removed them. Add them back.

Fixes: f870591a9bf5 ("libcamera: properties: Add location property")
Signed-off-by: Kieran Bingham <kieran.bingham@ideasonboard.com>
[Split the change out and reworded the commit message]
Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
---
 include/libcamera/meson.build | 2 ++
 1 file changed, 2 insertions(+)

Patch

diff --git a/include/libcamera/meson.build b/include/libcamera/meson.build
index f47c583cbbc0..88edf620f69e 100644
--- a/include/libcamera/meson.build
+++ b/include/libcamera/meson.build
@@ -44,6 +44,8 @@  foreach header : control_source_files
                                      install_dir : join_paths('include', include_dir))
 endforeach
 
+libcamera_api += control_headers
+
 gen_header = files('gen-header.sh')
 
 libcamera_h = custom_target('gen-header',