Igt-dev Archive on lore.kernel.org
 help / color / mirror / Atom feed
From: Mauro Carvalho Chehab <mauro.chehab@linux.intel.com>
To: igt-dev@lists.freedesktop.org
Subject: [igt-dev] [PATCH i-g-t v3 3/4] meson.build: place gtk-doc dependencies check at the right place
Date: Tue, 21 Mar 2023 10:22:04 +0100	[thread overview]
Message-ID: <20230321092205.1640976-4-mauro.chehab@linux.intel.com> (raw)
In-Reply-To: <20230321092205.1640976-1-mauro.chehab@linux.intel.com>

From: Mauro Carvalho Chehab <mchehab@kernel.org>

The requirement for having gtk-doc and have the tests built is only
for docs/reference/igt-gpu-tools.

So, move the code to be there. This lets build testplan docs
without needing gtk-doc (nor having the IGT executables).

Signed-off-by: Mauro Carvalho Chehab <mchehab@kernel.org>
---
 docs/reference/meson.build | 12 +++++++++++-
 meson.build                |  9 +--------
 2 files changed, 12 insertions(+), 9 deletions(-)

diff --git a/docs/reference/meson.build b/docs/reference/meson.build
index 85a8aa47f920..d0f38cd33892 100644
--- a/docs/reference/meson.build
+++ b/docs/reference/meson.build
@@ -1 +1,11 @@
-subdir('igt-gpu-tools')
+if build_docs.enabled()
+	gtk_doc = dependency('gtk-doc', required : true)
+
+	if build_tests and gtk_doc.found()
+		subdir('igt-gpu-tools')
+	else
+		error('Documentation requires building tests')
+	endif
+endif
+
+build_info += 'Build reference documentation: @0@'.format(build_docs.enabled())
diff --git a/meson.build b/meson.build
index cbb7ead7d9cd..5b4920a66944 100644
--- a/meson.build
+++ b/meson.build
@@ -332,14 +332,7 @@ endif
 subdir('overlay')
 subdir('man')
 subdir('scripts')
-
-gtk_doc = dependency('gtk-doc', required : build_docs)
-if build_tests and gtk_doc.found()
-	subdir('docs')
-elif build_docs.enabled()
-	error('Documentation requires building tests')
-endif
-build_info += 'Build documentation: @0@'.format(build_tests and gtk_doc.found())
+subdir('docs')
 
 message('Build options')
 message('=============')
-- 
2.39.2

  parent reply	other threads:[~2023-03-21  9:22 UTC|newest]

Thread overview: 7+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2023-03-21  9:22 [igt-dev] [PATCH i-g-t v3 0/4] Build Xe test documentation Mauro Carvalho Chehab
2023-03-21  9:22 ` [igt-dev] [PATCH i-g-t v3 1/4] meson: build " Mauro Carvalho Chehab
2023-03-21  9:22 ` [igt-dev] [PATCH i-g-t v3 2/4] testplan: build also a PDF file with the testplan Mauro Carvalho Chehab
2023-03-21  9:22 ` Mauro Carvalho Chehab [this message]
2023-03-21  9:22 ` [igt-dev] [PATCH i-g-t v3 4/4] testplan/meson.build: cleanup dependency chain Mauro Carvalho Chehab
2023-03-21 10:34 ` [igt-dev] ✗ GitLab.Pipeline: warning for Build Xe test documentation (rev2) Patchwork
2023-03-21 10:56 ` [igt-dev] ✗ Fi.CI.BAT: failure " Patchwork

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=20230321092205.1640976-4-mauro.chehab@linux.intel.com \
    --to=mauro.chehab@linux.intel.com \
    --cc=igt-dev@lists.freedesktop.org \
    /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