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

3053 diff mbox series

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(+)

Hi Kieran,

Thanks for your work.

On 2020-03-08 02:04:29 +0200, Laurent Pinchart wrote:
> 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>

Reviewed-by: Niklas Söderlund <niklas.soderlund@ragnatech.se>

> ---
>  include/libcamera/meson.build | 2 ++
>  1 file changed, 2 insertions(+)
> 
> 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',
> -- 
> Regards,
> 
> Laurent Pinchart
> 
> _______________________________________________
> libcamera-devel mailing list
> libcamera-devel@lists.libcamera.org
> https://lists.libcamera.org/listinfo/libcamera-devel