From 0555c09607e548b6c45d029ab31dbb3042195ae3 Mon Sep 17 00:00:00 2001 From: Scott D Phillips Date: Fri, 21 Oct 2016 00:47:14 -0700 Subject: [PATCH] meson: move gstreamer-check-1.0 dependency to tests/check https://bugzilla.gnome.org/show_bug.cgi?id=773114 --- meson.build | 2 -- tests/check/meson.build | 3 +++ tests/meson.build | 4 +++- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/meson.build b/meson.build index accedf2..0d2166e 100644 --- a/meson.build +++ b/meson.build @@ -113,8 +113,6 @@ gstsdp_dep = dependency('gstreamer-sdp-1.0', version : gst_req, fallback : ['gst-plugins-base', 'sdp_dep']) gstrtsp_dep = dependency('gstreamer-rtsp-1.0', version : gst_req, fallback : ['gst-plugins-base', 'rtsp_dep']) -gstcheck_dep = dependency('gstreamer-check-1.0', version : gst_req, - fallback : ['gstreamer', 'gst_check_dep']) gstcontroller_dep = dependency('gstreamer-controller-1.0', version : gst_req, fallback : ['gstreamer', 'gst_controller_dep']) diff --git a/tests/check/meson.build b/tests/check/meson.build index 79c2fcf..19bfdc4 100644 --- a/tests/check/meson.build +++ b/tests/check/meson.build @@ -1,3 +1,6 @@ +gstcheck_dep = dependency('gstreamer-check-1.0', version : gst_req, + fallback : ['gstreamer', 'gst_check_dep']) + # name, condition when to skip the test and extra dependencies ugly_tests = [ [ 'elements/amrnbenc', not amrnb_dep.found() ], diff --git a/tests/meson.build b/tests/meson.build index 0e2c887..cd3aa67 100644 --- a/tests/meson.build +++ b/tests/meson.build @@ -1 +1,3 @@ -subdir('check') +if host_machine.system() != 'windows' + subdir('check') +endif -- 2.7.4