| Message ID | 20200923151522.56778-9-ricardo@ribalda.com |
|---|---|
| State | Accepted |
| Headers | show |
| Series |
|
| Related | show |
On 23/09/2020 16:15, Ricardo Ribalda wrote: > Doxygen depends on dot to generate the documentation. Make this > dependency explicit on the meson file. > > Signed-off-by: Ricardo Ribalda <ricardo@ribalda.com> > --- > Documentation/meson.build | 3 ++- > 1 file changed, 2 insertions(+), 1 deletion(-) > > diff --git a/Documentation/meson.build b/Documentation/meson.build > index a09c7f2..7b497ae 100644 > --- a/Documentation/meson.build > +++ b/Documentation/meson.build > @@ -8,8 +8,9 @@ doc_install_dir = join_paths(get_option('datadir'), 'doc', > # > > doxygen = find_program('doxygen', required : false) > +dot = find_program('dot', required : false) > > -if doxygen.found() > +if doxygen.found() and dot.found() And this sounds helpful! Reviewed-by: Kieran Bingham <kieran.bingham@ideasonboard.com> > cdata = configuration_data() > cdata.set('VERSION', 'v@0@'.format(libcamera_git_version)) > cdata.set('TOP_SRCDIR', meson.source_root()) >
On Wed, Sep 23, 2020 at 09:14:18PM +0100, Kieran Bingham wrote: > On 23/09/2020 16:15, Ricardo Ribalda wrote: > > Doxygen depends on dot to generate the documentation. Make this > > dependency explicit on the meson file. > > > > Signed-off-by: Ricardo Ribalda <ricardo@ribalda.com> > > --- > > Documentation/meson.build | 3 ++- > > 1 file changed, 2 insertions(+), 1 deletion(-) > > > > diff --git a/Documentation/meson.build b/Documentation/meson.build > > index a09c7f2..7b497ae 100644 > > --- a/Documentation/meson.build > > +++ b/Documentation/meson.build > > @@ -8,8 +8,9 @@ doc_install_dir = join_paths(get_option('datadir'), 'doc', > > # > > > > doxygen = find_program('doxygen', required : false) > > +dot = find_program('dot', required : false) > > > > -if doxygen.found() > > +if doxygen.found() and dot.found() > > And this sounds helpful! > > Reviewed-by: Kieran Bingham <kieran.bingham@ideasonboard.com> Should the documentation option be turned into a feature, while at it ? > > cdata = configuration_data() > > cdata.set('VERSION', 'v@0@'.format(libcamera_git_version)) > > cdata.set('TOP_SRCDIR', meson.source_root())
diff --git a/Documentation/meson.build b/Documentation/meson.build index a09c7f2..7b497ae 100644 --- a/Documentation/meson.build +++ b/Documentation/meson.build @@ -8,8 +8,9 @@ doc_install_dir = join_paths(get_option('datadir'), 'doc', # doxygen = find_program('doxygen', required : false) +dot = find_program('dot', required : false) -if doxygen.found() +if doxygen.found() and dot.found() cdata = configuration_data() cdata.set('VERSION', 'v@0@'.format(libcamera_git_version)) cdata.set('TOP_SRCDIR', meson.source_root())
Doxygen depends on dot to generate the documentation. Make this dependency explicit on the meson file. Signed-off-by: Ricardo Ribalda <ricardo@ribalda.com> --- Documentation/meson.build | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)