| Message ID | 20200307211326.26994-4-laurent.pinchart@ideasonboard.com |
|---|---|
| State | Superseded |
| Headers | show |
| Series |
|
| Related | show |
Hi Laurent, On 07/03/2020 21:13, Laurent Pinchart wrote: > 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. Indeed, this makes sense. > Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com> Reviewed-by: Kieran Bingham <kieran.bingham@ideasonboard.com> > --- > include/libcamera/meson.build | 2 ++ > src/libcamera/meson.build | 2 +- > 2 files changed, 3 insertions(+), 1 deletion(-) > > diff --git a/include/libcamera/meson.build b/include/libcamera/meson.build > index 88edf620f69e..23c01d3837ba 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 88658ac563f7..1b69bc0dee54 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) > >
diff --git a/include/libcamera/meson.build b/include/libcamera/meson.build index 88edf620f69e..23c01d3837ba 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 88658ac563f7..1b69bc0dee54 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)
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> --- include/libcamera/meson.build | 2 ++ src/libcamera/meson.build | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-)