summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLaurent Pinchart <laurent.pinchart@ideasonboard.com>2020-03-07 19:33:43 +0200
committerLaurent Pinchart <laurent.pinchart@ideasonboard.com>2020-03-08 19:34:02 +0200
commit434bbe75dc61f00c90e19cbdfef8e2c928e8478c (patch)
treedc52e802100315699578482f85b37b2167132f9c
parent4ed68766435703f41a11caf7066d0396bd92aa1e (diff)
include: libcamera: meson: Add libcamera.h to the libcamera_api array
The libcamera_api array is meant to contain all the headers from the libcamera public API, for the purpose of generating documentation and creating the libcamera_dep dependency. libcamera.h is part of the libcamera public API, add it to the array. Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com> Reviewed-by: Kieran Bingham <kieran.bingham@ideasonboard.com> Reviewed-by: Niklas Söderlund <niklas.soderlund@ragnatech.se>
-rw-r--r--include/libcamera/meson.build2
-rw-r--r--src/libcamera/meson.build2
2 files changed, 3 insertions, 1 deletions
diff --git a/include/libcamera/meson.build b/include/libcamera/meson.build
index 88edf620..23c01d38 100644
--- a/include/libcamera/meson.build
+++ b/include/libcamera/meson.build
@@ -55,6 +55,8 @@ libcamera_h = custom_target('gen-header',
install : true,
install_dir : join_paths('include', include_dir))
+libcamera_api += libcamera_h
+
version = libcamera_version.split('.')
libcamera_version_config = configuration_data()
libcamera_version_config.set('LIBCAMERA_VERSION_MAJOR', version[0])
diff --git a/src/libcamera/meson.build b/src/libcamera/meson.build
index 88658ac5..1b69bc0d 100644
--- a/src/libcamera/meson.build
+++ b/src/libcamera/meson.build
@@ -120,7 +120,7 @@ libcamera = shared_library('camera',
build_rpath : '/',
dependencies : libcamera_deps)
-libcamera_dep = declare_dependency(sources : [libcamera_api, libcamera_ipa_api, libcamera_h],
+libcamera_dep = declare_dependency(sources : [libcamera_api, libcamera_ipa_api],
include_directories : libcamera_includes,
link_with : libcamera)