From b0d795263fb59149164b107c0f4f022f0c4f1047 Mon Sep 17 00:00:00 2001 From: Mathieu Duponchelle Date: Thu, 21 Dec 2017 19:24:20 +0100 Subject: [PATCH] tests: fix build when not building gstgl gstgl_dep is only defined when build_gstgl is true --- tests/check/meson.build | 25 +++++++++++++++---------- 1 file changed, 15 insertions(+), 10 deletions(-) diff --git a/tests/check/meson.build b/tests/check/meson.build index 492e63c..4401329 100644 --- a/tests/check/meson.build +++ b/tests/check/meson.build @@ -24,16 +24,6 @@ base_tests = [ [ 'libs/sdp.c' ], [ 'libs/tag.c' ], # [ 'libs/video' ], # FIXME: times out, perhaps split or spawn conversions into benchmark tool and/or multiple threads - [ 'libs/gstglcolorconvert.c', not build_gstgl, [gstgl_dep]], - [ 'libs/gstglcontext.c', not build_gstgl, [gstgl_dep]], - [ 'libs/gstglheaders.c', not build_gstgl, [gstgl_dep]], - [ 'libs/gstglmatrix.c', not build_gstgl, [gstgl_dep]], - [ 'libs/gstglmemory.c', not build_gstgl, [gstgl_dep]], - [ 'libs/gstglquery.c', not build_gstgl, [gstgl_dep]], - [ 'libs/gstglshader.c', not build_gstgl, [gstgl_dep]], - [ 'libs/gstglsl.c', not build_gstgl, [gstgl_dep]], - [ 'libs/gstglslstage.c', not build_gstgl, [gstgl_dep]], - [ 'libs/gstglupload.c', not build_gstgl, [gstgl_dep]], [ 'libs/videoencoder.c' ], [ 'libs/videotimecode.c' ], [ 'libs/xmpwriter.c' ], @@ -78,6 +68,21 @@ base_tests = [ [ 'pipelines/vorbisdec.c', not vorbisenc_dep.found(),], ] +if build_gstgl + base_tests += [ + [ 'libs/gstglcolorconvert.c', not build_gstgl, [gstgl_dep]], + [ 'libs/gstglcontext.c', not build_gstgl, [gstgl_dep]], + [ 'libs/gstglheaders.c', not build_gstgl, [gstgl_dep]], + [ 'libs/gstglmatrix.c', not build_gstgl, [gstgl_dep]], + [ 'libs/gstglmemory.c', not build_gstgl, [gstgl_dep]], + [ 'libs/gstglquery.c', not build_gstgl, [gstgl_dep]], + [ 'libs/gstglshader.c', not build_gstgl, [gstgl_dep]], + [ 'libs/gstglsl.c', not build_gstgl, [gstgl_dep]], + [ 'libs/gstglslstage.c', not build_gstgl, [gstgl_dep]], + [ 'libs/gstglupload.c', not build_gstgl, [gstgl_dep]] + ] +endif + # Make sure our headers are C++ clean if have_cxx base_tests += [ -- 2.7.4