[igt-dev] [PATCH i-g-t] meson: Make doc building dependent on gtk-doc
Arkadiusz Hiler
arkadiusz.hiler at intel.com
Wed Feb 27 18:06:43 UTC 2019
Currently, when gtk-doc is not installed 'ninja' succeeds but
'ninja install' fails with the following error:
FileNotFoundError: [Errno 2] No such file or directory: 'gtkdoc-scan': 'gtkdoc-scan'
With this patch 'meson build' will log that documentations would not
build and 'ninja install' will succeed.
When forcing building docs with 'meson -Dbuild_docs=true build' the
following error will occur instead:
meson.build:323:0: ERROR: Dependency "gtk-doc" not found, tried pkgconfig and cmake
Cc: Petri Latvala <petri.latvala at intel.com>
Reported-by: Tvrtko Ursulin <tvrtko.ursulin at linux.intel.com>
Signed-off-by: Arkadiusz Hiler <arkadiusz.hiler at intel.com>
---
meson.build | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/meson.build b/meson.build
index 099db897..557400a5 100644
--- a/meson.build
+++ b/meson.build
@@ -320,9 +320,11 @@ endif
subdir('overlay')
subdir('man')
+gtk_doc = dependency('gtk-doc', required : _docs_required)
+
docs_info = 'No'
if _build_docs
- if _build_tests
+ if _build_tests and gtk_doc.found()
subdir('docs')
docs_info = 'Yes'
elif _docs_required
--
2.20.1
More information about the igt-dev
mailing list