[igt-dev] [PATCH i-g-t 2/2] docs/meson: Remove the hax for meson < 0.47
Arkadiusz Hiler
arkadiusz.hiler at intel.com
Tue May 21 09:36:02 UTC 2019
With updated minimum required version to 0.47.0 it is no longer needed.
Cc: Daniel Vetter <daniel.vetter at ffwll.ch>
Cc: Petri Latvala <petri.latvala at intel.com>
Signed-off-by: Arkadiusz Hiler <arkadiusz.hiler at intel.com>
---
docs/reference/igt-gpu-tools/meson.build | 41 +++++++-----------------
1 file changed, 11 insertions(+), 30 deletions(-)
diff --git a/docs/reference/igt-gpu-tools/meson.build b/docs/reference/igt-gpu-tools/meson.build
index b2b2c1c2..4d177e49 100644
--- a/docs/reference/igt-gpu-tools/meson.build
+++ b/docs/reference/igt-gpu-tools/meson.build
@@ -54,37 +54,18 @@ configure_file(input: 'version.xml.in',
output: 'version.xml',
install: false, configuration: config)
-if meson.version().version_compare('>= 0.47')
- foreach group : test_groups
- programs_xml = 'igt_test_programs_' + group + '_programs.xml'
- generated_docs += custom_target(programs_xml,
- output : programs_xml,
- command : [ gen_programs, '@OUTPUT@', group, test_list_target ])
+foreach group : test_groups
+ programs_xml = 'igt_test_programs_' + group + '_programs.xml'
+ generated_docs += custom_target(programs_xml,
+ output : programs_xml,
+ command : [ gen_programs, '@OUTPUT@', group, test_list_target ])
- description_xml = 'igt_test_programs_' + group + '_description.xml'
- generated_docs += custom_target(description_xml,
- output : description_xml,
- depends : test_executables,
- command : [ gen_description, '@OUTPUT@', group, test_list_target ])
- endforeach
-else
- # older meson needs the build_by_default hack because gtkdoc dependency
- # handling is broken
- foreach group : test_groups
- programs_xml = 'igt_test_programs_' + group + '_programs.xml'
- custom_target(programs_xml,
- build_by_default : true,
- output : programs_xml,
- command : [ gen_programs, '@OUTPUT@', group, test_list_target ])
-
- description_xml = 'igt_test_programs_' + group + '_description.xml'
- custom_target(description_xml,
- build_by_default : true,
- output : description_xml,
- depends : test_executables,
- command : [ gen_description, '@OUTPUT@', group, test_list_target ])
- endforeach
-endif
+ description_xml = 'igt_test_programs_' + group + '_description.xml'
+ generated_docs += custom_target(description_xml,
+ output : description_xml,
+ depends : test_executables,
+ command : [ gen_description, '@OUTPUT@', group, test_list_target ])
+endforeach
gnome.gtkdoc('igt-gpu-tools',
content_files : ['igt_test_programs.xml'] + generated_docs,
--
2.21.0
More information about the igt-dev
mailing list