[igt-dev] [PATCH i-g-t] gtkdoc: Remove the build_by_default hack

Daniel Vetter daniel.vetter at ffwll.ch
Tue Mar 6 14:21:12 UTC 2018


meson 0.45 properly supports generated content_files. Except for the
minor issue that we're hitting an internal bug in meson. I've made a
pull request for that, but this needs more work:

https://github.com/mesonbuild/meson/pull/3189

Downside of this all is that we'd need to up the meson requirements to
something like 0.46, at least if you want to build the docs.

Cc: Eric Anholt <eric at anholt.net>
Signed-off-by: Daniel Vetter <daniel.vetter at intel.com>
---
 docs/reference/intel-gpu-tools/meson.build | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/docs/reference/intel-gpu-tools/meson.build b/docs/reference/intel-gpu-tools/meson.build
index 1c009229aae2..5f6646eb8fa2 100644
--- a/docs/reference/intel-gpu-tools/meson.build
+++ b/docs/reference/intel-gpu-tools/meson.build
@@ -50,17 +50,17 @@ gen_programs = find_program('generate_programs_xml.sh')
 
 test_list_files = []
 
+generated_docs = []
+
 foreach group : test_groups
 	programs_xml = 'igt_test_programs_' + group + '_programs.xml'
-	custom_target(programs_xml,
+	generated_docs += custom_target(programs_xml,
 		      output : programs_xml,
-		      build_by_default : true,
 		      command : [ gen_programs, '@OUTPUT@', group, test_list ])
 
 	description_xml = 'igt_test_programs_' + group + '_description.xml'
-	custom_target(description_xml,
+	generated_docs += custom_target(description_xml,
 		      output : description_xml,
-		      build_by_default : true,
 		      depends : test_executables,
 		      command : [ gen_description, '@OUTPUT@', group, test_list ])
 endforeach
@@ -70,7 +70,7 @@ configure_file(input: 'version.xml.in',
 	       install: false, configuration: config)
 
 gnome.gtkdoc('intel-gpu-tools',
-	     content_files : ['igt_test_programs.xml'],
+	     content_files : ['igt_test_programs.xml'] + generated_docs,
 	     dependencies : lib_igt,
 	     install : true,
 	     main_xml : 'intel-gpu-tools-docs.xml',
-- 
2.15.1



More information about the igt-dev mailing list