[libcamera-devel] [PATCH v1 2/6] ipa: meson: Install mojom generated headers to include paths

[Laurent Pinchart]

On Fri, May 14, 2021 at 10:33:21AM +0100, Kieran Bingham wrote:
> On 14/05/2021 08:58, Umang Jain wrote:
> > Generated IPA headers from mojom files need to be installed sy
> 
> sy? Perhaps in? or to?
> 
> > $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>
> 
> Seems like the right things to do.
> 
> Reviewed-by: Kieran Bingham <kieran.bingham at ideasonboard.com>

Agreed,

Reviewed-by: Laurent Pinchart <laurent.pinchart 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 69bc855e..da60aa68 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',
> > @@ -11,7 +13,7 @@ libcamera_ipa_docs = files([
> >  ])
> >  
> >  install_headers(libcamera_ipa_headers,
> > -                subdir: libcamera_include_dir / 'ipa')
> > +                subdir: libcamera_ipa_include_dir)
> >  
> >  libcamera_generated_ipa_headers = []
> >  
> > @@ -35,6 +37,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('includedir') / libcamera_ipa_include_dir,
> >                    command : [
> >                        mojom_generator, 'generate',
> >                        '-g', 'libcamera',
> > @@ -97,6 +101,8 @@ foreach file : ipa_mojom_files
> >                             input : mojom,
> >                             output : name + '_ipa_interface.h',
> >                             depends : mojom_templates,
> > +                           install : true,
> > +                           install_dir : get_option('includedir') / libcamera_ipa_include_dir,
> >                             command : [
> >                                 mojom_generator, 'generate',
> >                                 '-g', 'libcamera',

-- 
Regards,

Laurent Pinchart