libcamera: Move ipa includes to the same level as libcamera

The ipa includes are located in include/libcamera/ipa/. This gives an
incorrect impression that they are a sub-part of the rest of the
libcamera API, while they are the API towards the IPA the same way that
include/libcamera/ contains the API towards applications. To clarify
this, move them to include/ipa/.

The IPA headers are however still part of libcamera, so installing them
to ${prefix}/include/ipa/ would make little sense. To fix this, move the
application facing API to ${prefix}/include/libcamera/libcamera/ when
installed, and the IPA to ${prefix}/include/libcamera/ipa/. When major
versions of libcamera will be released, they could then be installed
side by side in ${prefix}/include/libcamera-${version}/.

Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Reviewed-by: Jacopo Mondi <jacopo@jmondi.org>

5 files changed, 15 insertions, 5 deletions

diff --git a/include/libcamera/ipa/ipa_interface.h b/include/ipa/ipa_interface.h
index 2c5eb1fd..2c5eb1fd 100644
--- a/include/libcamera/ipa/ipa_interface.h
+++ b/include/ipa/ipa_interface.h
diff --git a/include/libcamera/ipa/ipa_module_info.h b/include/ipa/ipa_module_info.h
index d9e33c1d..d9e33c1d 100644
--- a/include/libcamera/ipa/ipa_module_info.h
+++ b/include/ipa/ipa_module_info.h
diff --git a/include/ipa/meson.build b/include/ipa/meson.build
new file mode 100644
index 00000000..a0ce96ba
--- /dev/null
+++ b/include/ipa/meson.build
@@ -0,0 +1,7 @@
+libcamera_ipa_api = files([
+    'ipa_interface.h',
+    'ipa_module_info.h',
+])
+
+install_headers(libcamera_ipa_api,
+                subdir: join_paths(libcamera_include_dir, 'ipa'))
diff --git a/include/libcamera/meson.build b/include/libcamera/meson.build
index a8a38a9b..868f1a6b 100644
--- a/include/libcamera/meson.build
+++ b/include/libcamera/meson.build
@@ -8,8 +8,6 @@ libcamera_api = files([
     'event_dispatcher.h',
     'event_notifier.h',
     'geometry.h',
-    'ipa/ipa_interface.h',
-    'ipa/ipa_module_info.h',
     'logging.h',
     'object.h',
     'request.h',
@@ -18,6 +16,8 @@ libcamera_api = files([
     'timer.h',
 ])
 
+include_dir = join_paths(libcamera_include_dir, 'libcamera')
+
 gen_header = files('gen-header.sh')
 
 libcamera_h = custom_target('gen-header',
@@ -25,7 +25,7 @@ libcamera_h = custom_target('gen-header',
                             output : 'libcamera.h',
                             command : [gen_header, meson.current_source_dir(), '@OUTPUT@'],
                             install : true,
-                            install_dir : 'include/libcamera')
+                            install_dir : join_paths('include', include_dir))
 
 version = libcamera_version.split('.')
 libcamera_version_config = configuration_data()
@@ -36,7 +36,7 @@ libcamera_version_config.set('LIBCAMERA_VERSION_PATCH', version[2])
 configure_file(input : 'version.h.in',
                output : 'version.h',
                configuration : libcamera_version_config,
-               install_dir : 'include/libcamera')
+               install_dir : join_paths('include', include_dir))
 
 install_headers(libcamera_api,
-                subdir : 'libcamera')
+                subdir : include_dir)
diff --git a/include/meson.build b/include/meson.build
index a89c0d7f..42b24534 100644
--- a/include/meson.build
+++ b/include/meson.build
@@ -1,2 +1,5 @@
+libcamera_include_dir = 'libcamera'
+
 subdir('android')
+subdir('ipa')
 subdir('libcamera')