[libcamera-devel,v3,3/5] ipa: meson: Allow IPAs to include internal headers

Message ID 20191006200852.11775-4-jacopo@jmondi.org
State Superseded
Headers show
Series
  • test: Add IPA interface test support
Related show

Commit Message

Jacopo Mondi Oct. 6, 2019, 8:08 p.m. UTC
Extend the list of inclusion paths for the IPA modules in src/ipa/ to
include internal libcamera headers.

Only Open Source IPA implementations will live in src/ipa/ and they link
against libcamera, so they should be able to include internal headers as
well as public ones.

Signed-off-by: Jacopo Mondi <jacopo@jmondi.org>
---
 src/ipa/meson.build | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

Comments

Laurent Pinchart Oct. 7, 2019, 3:37 a.m. UTC | #1
Hi Jacopo,

Thank you for thr patch.

On Sun, Oct 06, 2019 at 10:08:50PM +0200, Jacopo Mondi wrote:
> Extend the list of inclusion paths for the IPA modules in src/ipa/ to
> include internal libcamera headers.
> 
> Only Open Source IPA implementations will live in src/ipa/ and they link
> against libcamera, so they should be able to include internal headers as
> well as public ones.

The contents look good, but the commit message is now a bit outdated.
How about the following ?

----
ipa: meson: Give IPAs access to internal libcamera APIs

Open source IPA implementations can benefit from usage of libcamera
internal APIs. Allow this by compiling against the internal headers and
linking against libcamera.
----

Reviewed-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>

> Signed-off-by: Jacopo Mondi <jacopo@jmondi.org>
> ---
>  src/ipa/meson.build | 8 +++++++-
>  1 file changed, 7 insertions(+), 1 deletion(-)
> 
> diff --git a/src/ipa/meson.build b/src/ipa/meson.build
> index b5bcd7b2c3db..ac16e1da6126 100644
> --- a/src/ipa/meson.build
> +++ b/src/ipa/meson.build
> @@ -5,10 +5,16 @@ ipa_vimc_sources = [
>  
>  ipa_install_dir = join_paths(get_option('libdir'), 'libcamera')
>  
> +ipa_includes = [
> +    libcamera_includes,
> +    libcamera_internal_includes,
> +]
> +
>  foreach t : ipa_vimc_sources
>      ipa = shared_module(t[0], 'ipa_vimc.cpp',
>                          name_prefix : '',
> -                        include_directories : libcamera_includes,
> +                        include_directories : ipa_includes,
> +                        dependencies : libcamera_dep,
>                          install : true,
>                          install_dir : ipa_install_dir,
>                          cpp_args : '-DLICENSE="' + t[1] + '"')

Patch

diff --git a/src/ipa/meson.build b/src/ipa/meson.build
index b5bcd7b2c3db..ac16e1da6126 100644
--- a/src/ipa/meson.build
+++ b/src/ipa/meson.build
@@ -5,10 +5,16 @@  ipa_vimc_sources = [
 
 ipa_install_dir = join_paths(get_option('libdir'), 'libcamera')
 
+ipa_includes = [
+    libcamera_includes,
+    libcamera_internal_includes,
+]
+
 foreach t : ipa_vimc_sources
     ipa = shared_module(t[0], 'ipa_vimc.cpp',
                         name_prefix : '',
-                        include_directories : libcamera_includes,
+                        include_directories : ipa_includes,
+                        dependencies : libcamera_dep,
                         install : true,
                         install_dir : ipa_install_dir,
                         cpp_args : '-DLICENSE="' + t[1] + '"')