mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2024-12-18 14:26:43 +00:00
Code Issues 1 Projects Releases Wiki Activity

meson: Use get_pkgconfig_variable instead of calling pkg-config ourself

Browse source 
It is avalaible in meson 0.36 which is now are requirement
This commit is contained in:
Thibault Saunier 2017-03-28 14:23:16 -03:00
parent 1b3bdf3e10
commit a7be8815b5
1 changed files with 5 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
tests/check/meson.build
View file

@ -127,18 +127,10 @@ test_defines = [
] ]
pluginsdirs = [] pluginsdirs = []
# FIXME: Use if not gst_dep.is_internal() when avalaible as we only support the if gst_dep.type_name() == 'pkgconfig'
# case where GStreamer is another subproject here. pbase = dependency('gstreamer-plugins-base-' + api_version, required : false)
if not meson.is_subproject() pluginsdirs = [gst_dep.get_pkgconfig_variable('pluginsdir'),
pkgconfig = find_program('pkg-config') pbase.get_pkgconfig_variable('pluginsdir')]
runcmd = run_command(pkgconfig, '--variable=pluginsdir',
'gstreamer-' + api_version, 'gstreamer-plugins-base-' + api_version)
if runcmd.returncode() == 0
pluginsdirs = runcmd.stdout().split()
else
error('Could not determine GStreamer core plugins directory for unit tests.')
endif
endif endif
# fake device drivers: we could run hardware element tests against dummy drivers # fake device drivers: we could run hardware element tests against dummy drivers