| Message ID | 20240805143654.20870-8-laurent.pinchart@ideasonboard.com |
|---|---|
| State | Accepted |
| Headers | show |
| Series |
|
| Related | show |
On 05/08/2024 15:36, Laurent Pinchart wrote: > The generated version.h header is part of the public headers, but is > missing from the libcamera_public_headers variable. Add it. > > Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com> > --- Reviewed-by: Daniel Scally <dan.scally@ideasonboard.com> > include/libcamera/meson.build | 9 +++++---- > 1 file changed, 5 insertions(+), 4 deletions(-) > > diff --git a/include/libcamera/meson.build b/include/libcamera/meson.build > index 84c6c4cb8bf6..c8c900eba66a 100644 > --- a/include/libcamera/meson.build > +++ b/include/libcamera/meson.build > @@ -120,7 +120,8 @@ libcamera_version_config.set('LIBCAMERA_VERSION_MAJOR', version[0]) > libcamera_version_config.set('LIBCAMERA_VERSION_MINOR', version[1]) > libcamera_version_config.set('LIBCAMERA_VERSION_PATCH', version[2]) > > -configure_file(input : 'version.h.in', > - output : 'version.h', > - configuration : libcamera_version_config, > - install_dir : libcamera_headers_install_dir) > +version_h = configure_file(input : 'version.h.in', > + output : 'version.h', > + configuration : libcamera_version_config, > + install_dir : libcamera_headers_install_dir) > +libcamera_public_headers += version_h
Quoting Laurent Pinchart (2024-08-05 15:36:43) > The generated version.h header is part of the public headers, but is > missing from the libcamera_public_headers variable. Add it. > Reviewed-by: Kieran Bingham <kieran.bingham@ideasonboard.com> > Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com> > --- > include/libcamera/meson.build | 9 +++++---- > 1 file changed, 5 insertions(+), 4 deletions(-) > > diff --git a/include/libcamera/meson.build b/include/libcamera/meson.build > index 84c6c4cb8bf6..c8c900eba66a 100644 > --- a/include/libcamera/meson.build > +++ b/include/libcamera/meson.build > @@ -120,7 +120,8 @@ libcamera_version_config.set('LIBCAMERA_VERSION_MAJOR', version[0]) > libcamera_version_config.set('LIBCAMERA_VERSION_MINOR', version[1]) > libcamera_version_config.set('LIBCAMERA_VERSION_PATCH', version[2]) > > -configure_file(input : 'version.h.in', > - output : 'version.h', > - configuration : libcamera_version_config, > - install_dir : libcamera_headers_install_dir) > +version_h = configure_file(input : 'version.h.in', > + output : 'version.h', > + configuration : libcamera_version_config, > + install_dir : libcamera_headers_install_dir) > +libcamera_public_headers += version_h > -- > Regards, > > Laurent Pinchart >
diff --git a/include/libcamera/meson.build b/include/libcamera/meson.build index 84c6c4cb8bf6..c8c900eba66a 100644 --- a/include/libcamera/meson.build +++ b/include/libcamera/meson.build @@ -120,7 +120,8 @@ libcamera_version_config.set('LIBCAMERA_VERSION_MAJOR', version[0]) libcamera_version_config.set('LIBCAMERA_VERSION_MINOR', version[1]) libcamera_version_config.set('LIBCAMERA_VERSION_PATCH', version[2]) -configure_file(input : 'version.h.in', - output : 'version.h', - configuration : libcamera_version_config, - install_dir : libcamera_headers_install_dir) +version_h = configure_file(input : 'version.h.in', + output : 'version.h', + configuration : libcamera_version_config, + install_dir : libcamera_headers_install_dir) +libcamera_public_headers += version_h
The generated version.h header is part of the public headers, but is missing from the libcamera_public_headers variable. Add it. Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com> --- include/libcamera/meson.build | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-)