From 491e8c173e288931101e21f5f6f48f098f16d876 Mon Sep 17 00:00:00 2001 From: Daniel Vetter Date: Tue, 5 Dec 2017 11:16:49 +0100 Subject: meson: gtkdoc support Bunch of neat improvements: - xml generates correctly depend upon the test binaries - no need to re-run autogen.sh when new chapters/functions get added, all handed by meson Still one issue: - the gtkdoc target doesn't depend upon the custom_target yet, hacked around using build_by_default: true This is an issue known to upstream already: https://github.com/mesonbuild/meson/issues/2148 v2: Bump meson version to 0.42, since that's the first release which adds the build dir when running the gtkdoc tools, and hence allows including generated files. v2: - Undo the bump, it's only needed for generated source files. Other generated files as input should work with 0.40 already. - Generate version.xml from version.xml.in, which allows us to keep the &version; entity. v3: Add github issue link. v4: - Resurrect lost KEYWORDS (Petri) - Fix issue when running with a clean build, files() doesn't work on generate files (Petri). Reviewed-by: Petri Latvala Signed-off-by: Daniel Vetter --- tests/meson.build | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'tests') diff --git a/tests/meson.build b/tests/meson.build index 155a99fc..1efeda97 100644 --- a/tests/meson.build +++ b/tests/meson.build @@ -258,12 +258,14 @@ endif libexecdir = join_paths(get_option('prefix'), get_option('libexecdir'), 'intel-gpu-tools') +test_executables = [] + foreach prog : test_progs link = [] if prog == 'perf_pmu' link += lib_igt_perf endif - executable(prog, prog + '.c', + test_executables += executable(prog, prog + '.c', dependencies : test_deps, install_dir : libexecdir, link_with : link, @@ -279,7 +281,7 @@ test_progs += 'testdisplay' pkgdatadir = join_paths(get_option('prefix'), get_option('datadir'), 'intel-gpu-tools') gen_testlist = find_program('generate_testlist.sh') -custom_target('testlist', +test_list = custom_target('testlist', output : 'test-list.txt', command : [ gen_testlist, '@OUTPUT@', test_progs ], install : true, -- cgit v1.2.3