meson: Use get_pkgconfig_variable instead of calling pkg-config ourself

It is avalaible in meson 0.36 which is now are requirement
This commit is contained in:
Thibault Saunier 2017-03-28 14:31:34 -03:00
parent 546a99026b
commit 69a10f67a5

View file

@ -90,18 +90,8 @@ test_deps = [gst_dep, gst_base_dep, gst_net_dep, gst_check_dep, audio_dep,
fft_dep, riff_dep, sdp_dep, gio_dep] + glib_deps fft_dep, riff_dep, sdp_dep, gio_dep] + glib_deps
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. pluginsdirs = [gst_dep.get_pkgconfig_variable('pluginsdir')]
if not meson.is_subproject()
pkgconfig = find_program('pkg-config')
runcmd = run_command(pkgconfig, '--variable=pluginsdir',
'gstreamer-' + 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
foreach t : base_tests foreach t : base_tests