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

Umang Jain umang.jain at ideasonboard.com
Fri May 21 15:28:21 CEST 2021


Generated IPA headers from mojom files need to be installed 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>
Reviewed-by: Kieran Bingham <kieran.bingham at ideasonboard.com>
Reviewed-by: Laurent Pinchart <laurent.pinchart at ideasonboard.com>
Reviewed-by: Jean-Michel Hautbois <jeanmichel.hautbois at ideasonboard.com>
Reviewed-by: Paul Elder <paul.elder 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 40c4e737..eca4e9ee 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: 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('includedir') / libcamera_ipa_include_dir,
                   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('includedir') / libcamera_ipa_include_dir,
                            command : [
                                mojom_generator, 'generate',
                                '-g', 'libcamera',
-- 
2.26.2



More information about the libcamera-devel mailing list