[igt-dev] [PATCH i-g-t v3 3/4] meson.build: place gtk-doc dependencies check at the right place
Mauro Carvalho Chehab
mauro.chehab at linux.intel.com
Tue Mar 21 09:22:04 UTC 2023
From: Mauro Carvalho Chehab <mchehab at 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 at 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
More information about the igt-dev
mailing list