[libcamera-devel] [RFCv1.1 PATCH] ipa: meson: Install mojom generated headers to include paths

[paul.elder at ideasonboard.com]

Hi Umang,

On Thu, Apr 29, 2021 at 12:30:51PM +0530, Umang Jain wrote:
> Generated IPA headers from mojom files need to be installed sy
> $INCLUDE_PATH in order to be available system-wide. Without this,
> out-of-tree IPAs won't be able to link and build themselves.
> 
> Signed-off-by: Umang Jain <umang.jain at ideasonboard.com>
> ---
>  include/libcamera/ipa/meson.build | 8 +++++++-
>  1 file changed, 7 insertions(+), 1 deletion(-)
> 
> diff --git a/include/libcamera/ipa/meson.build b/include/libcamera/ipa/meson.build
> index 2d72c1fc..0c3e3dcd 100644
> --- a/include/libcamera/ipa/meson.build
> +++ b/include/libcamera/ipa/meson.build
> @@ -1,5 +1,7 @@
>  # SPDX-License-Identifier: CC0-1.0
>  
> +libcamera_ipa_include_dir = libcamera_include_dir / 'ipa'
> +
>  libcamera_ipa_headers = files([
>      'ipa_controls.h',
>      'ipa_interface.h',
> @@ -7,7 +9,7 @@ libcamera_ipa_headers = files([
>  ])
>  
>  install_headers(libcamera_ipa_headers,
> -                subdir: join_paths(libcamera_include_dir, 'ipa'))
> +                subdir: libcamera_ipa_include_dir)
>  
>  libcamera_generated_ipa_headers = []
>  
> @@ -31,6 +33,8 @@ libcamera_generated_ipa_headers += custom_target('core_ipa_interface_h',
>                    input : ipa_mojom_core,
>                    output : 'core_ipa_interface.h',
>                    depends : mojom_templates,
> +                  install : true,
> +                  install_dir : get_option('prefix') / 'include' / libcamera_ipa_include_dir,

Should 'include' instead be get_option('includedir') ? I see a similar
pattern for installing the IPAs in src/ipa/meson.build.


Paul

>                    command : [
>                        mojom_generator, 'generate',
>                        '-g', 'libcamera',
> @@ -93,6 +97,8 @@ foreach file : ipa_mojom_files
>                             input : mojom,
>                             output : name + '_ipa_interface.h',
>                             depends : mojom_templates,
> +                           install : true,
> +                           install_dir : get_option('prefix') / 'include' / libcamera_ipa_include_dir,
>                             command : [
>                                 mojom_generator, 'generate',
>                                 '-g', 'libcamera',
> -- 
> 2.26.2
> 
> _______________________________________________
> libcamera-devel mailing list
> libcamera-devel at lists.libcamera.org
> https://lists.libcamera.org/listinfo/libcamera-devel