From: Arkadiusz Hiler <arkadiusz.hiler@intel.com>
To: igt-dev@lists.freedesktop.org
Cc: Petri Latvala <petri.latvala@intel.com>
Subject: [igt-dev] [PATCH i-g-t] meson: Make doc building dependent on gtk-doc
Date: Wed, 27 Feb 2019 20:06:43 +0200 [thread overview]
Message-ID: <20190227180643.8038-1-arkadiusz.hiler@intel.com> (raw)
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
next reply other threads:[~2019-02-27 18:06 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-02-27 18:06 Arkadiusz Hiler [this message]
2019-02-27 19:19 ` [igt-dev] ✓ Fi.CI.BAT: success for meson: Make doc building dependent on gtk-doc 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
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20190227180643.8038-1-arkadiusz.hiler@intel.com \
--to=arkadiusz.hiler@intel.com \
--cc=igt-dev@lists.freedesktop.org \
--cc=petri.latvala@intel.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox