From 0fd4a11711a234457bb2d4276176c6dd818f2a9b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tim-Philipp=20M=C3=BCller?= Date: Mon, 26 Jun 2017 09:38:46 +0100 Subject: [PATCH] meson: tests: icles: simplify build file --- tests/icles/meson.build | 66 +++++++++++++++-------------------------- 1 file changed, 24 insertions(+), 42 deletions(-) diff --git a/tests/icles/meson.build b/tests/icles/meson.build index 1615c96883..0769706cc1 100644 --- a/tests/icles/meson.build +++ b/tests/icles/meson.build @@ -1,43 +1,3 @@ -gtk_dep = dependency('gtk+-3.0', version : '>= 3.0.0', required : false) -if gtk_dep.found() - executable('gdkpixbufsink-test', 'gdkpixbufsink-test.c', - dependencies: [gst_dep, gtk_dep], - c_args : gst_plugins_good_args, - include_directories : [configinc], - install: false) - - executable('gdkpixbufoverlay-test', 'gdkpixbufoverlay-test.c', - dependencies: [gstvideo_dep, gst_dep, gtk_dep, libm], - c_args : gst_plugins_good_args, - include_directories : [configinc], - install: false) -endif - -if cdata.has('HAVE_GST_V4L2') - executable('v4l2src-test', 'v4l2src-test.c', - dependencies: [gstvideo_dep, gst_dep, libm], - c_args : gst_plugins_good_args, - include_directories : [configinc], - install: false) -endif - -if get_variable('have_oss4', false) - executable('test-oss4', 'test-oss4.c', - dependencies: gst_dep, - c_args : gst_plugins_good_args, - include_directories : [configinc], - install: false) -endif - -if get_variable('x11_dep', dependency('', required: false)).found() - executable('ximagesrc-test', 'ximagesrc-test.c', - dependencies: [gst_dep, libm], - c_args : gst_plugins_good_args, - include_directories : [configinc], - install: false) -endif - - tests = [ ['equalizer-test'], ['test-accurate-seek', gstapp_dep], @@ -47,9 +7,31 @@ tests = [ ['videocrop2-test'], ] +gtk_dep = dependency('gtk+-3.0', version : '>= 3.0.0', required : false) +if gtk_dep.found() + tests += [ + ['gdkpixbufsink-test', gtk_dep], + ['gdkpixbufoverlay-test', [gstvideo_dep, gtk_dep]], + ] +endif + +if cdata.has('HAVE_GST_V4L2') + tests += [['v4l2src-test', gstvideo_dep]] +endif + +if get_variable('have_oss4', false) + tests += [['test-oss4']] +endif + +if get_variable('x11_dep', dependency('', required: false)).found() + tests += [['ximagesrc-test']] +endif + foreach t : tests - executable(t.get(0), t.get(0) + '.c', - dependencies: [gst_dep, libm] + [t.get(1, [])], + test_name = t.get(0) + extra_deps = t.get(1, []) + executable(test_name, test_name + '.c', + dependencies: [gst_dep, libm, extra_deps], c_args : gst_plugins_good_args, include_directories : [configinc], install: false)