mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2024-11-30 21:51:09 +00:00
Code Issues 1 Projects Releases Wiki Activity

meson: Do not build libges against libcheck

Browse source
This commit is contained in:
Thibault Saunier 2016-09-07 16:53:06 -03:00
parent 042de8118b
commit 4434392b2c
2 changed files with 2 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
meson.build
View file

@ -68,7 +68,7 @@ libxml_dep = dependency('libxml-2.0')
# gtk_dep = dependency('gtk+-3.0', required : false) # gtk_dep = dependency('gtk+-3.0', required : false)
libges_deps = [gst_dep, gstbase_dep, gstvideo_dep, gstpbutils_dep, libges_deps = [gst_dep, gstbase_dep, gstvideo_dep, gstpbutils_dep,
gstcheck_dep, gstcontroller_dep, gio_dep, libxml_dep] gstcontroller_dep, gio_dep, libxml_dep]
if gstvalidate_dep.found() if gstvalidate_dep.found()
libges_deps = libges_deps + [gstvalidate_dep] libges_deps = libges_deps + [gstvalidate_dep]

1
tests/check/meson.build
View file

@ -35,6 +35,7 @@ test_defines = [
getpluginsdir = find_program('getpluginsdir') getpluginsdir = find_program('getpluginsdir')
runcmd = run_command(getpluginsdir, 'gstreamer', 'gstreamer-' + apiversion, runcmd = run_command(getpluginsdir, 'gstreamer', 'gstreamer-' + apiversion,
'gst-plugins-base', 'gstreamer-plugins-base-' + apiversion, 'gst-plugins-base', 'gstreamer-plugins-base-' + apiversion,
'gst-plugins-good', 'gstreamer-plugins-good-' + apiversion,
'gst-plugins-bad', 'gstreamer-plugins-bad-' + apiversion) 'gst-plugins-bad', 'gstreamer-plugins-bad-' + apiversion)
if runcmd.returncode() == 0 if runcmd.returncode() == 0
needed_plugins_dirs = runcmd.stdout().strip() + ':' + meson.build_root() + '/plugins/nle' needed_plugins_dirs = runcmd.stdout().strip() + ':' + meson.build_root() + '/plugins/nle'