All of lore.kernel.org
 help / color / mirror / Atom feed
* [igt-dev] [PATCH i-g-t] meson: Make doc building dependent on gtk-doc
@ 2019-02-27 18:06 Arkadiusz Hiler
  2019-02-27 19:19 ` [igt-dev] ✓ Fi.CI.BAT: success for " Patchwork
                   ` (2 more replies)
  0 siblings, 3 replies; 6+ messages in thread
From: Arkadiusz Hiler @ 2019-02-27 18:06 UTC (permalink / raw)
  To: igt-dev; +Cc: Petri Latvala

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@intel.com>
Reported-by: Tvrtko Ursulin <tvrtko.ursulin@linux.intel.com>
Signed-off-by: Arkadiusz Hiler <arkadiusz.hiler@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

_______________________________________________
igt-dev mailing list
igt-dev@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/igt-dev

^ permalink raw reply related	[flat|nested] 6+ messages in thread

end of thread, other threads:[~2019-02-28 11:44 UTC | newest]

Thread overview: 6+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2019-02-27 18:06 [igt-dev] [PATCH i-g-t] meson: Make doc building dependent on gtk-doc Arkadiusz Hiler
2019-02-27 19:19 ` [igt-dev] ✓ Fi.CI.BAT: success for " Patchwork
2019-02-27 20:19 ` [igt-dev] ✗ Fi.CI.IGT: failure " Patchwork
2019-02-28  7:41   ` Arkadiusz Hiler
2019-02-28 10:59 ` [igt-dev] [PATCH i-g-t] " Petri Latvala
2019-02-28 11:44   ` Arkadiusz Hiler

This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.