mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2025-06-07 07:58:51 +00:00
Code Issues 1 Projects Releases Wiki Activity

meson: use dep.get_pkgconfig_variable()

Browse source 
instead of calling pkg-config ourselves.
This commit is contained in:
Tim-Philipp Müller 2017-06-05 23:57:48 +01:00
parent 16b8851440
commit e774d1ca4b
2 changed files with 8 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
ext/libvisual/meson.build
View file

@ -5,13 +5,9 @@ libvisual_sources = [
libvisual_dep = dependency('libvisual-0.4', version : '>= 0.4.0', required : false) libvisual_dep = dependency('libvisual-0.4', version : '>= 0.4.0', required : false)
if libvisual_dep.found() if libvisual_dep.found()
runcmd = run_command('pkg-config', '--variable=pluginsbasedir', 'libvisual-0.4') core_conf.set_quoted('LIBVISUAL_PLUGINSBASEDIR',
if runcmd.returncode() == 0 libvisual_dep.get_pkgconfig_variable('pluginsbasedir'))
core_conf.set('LIBVISUAL_PLUGINSBASEDIR', '"@0@"'.format(runcmd.stdout().strip()))
endif
endif
if libvisual_dep.found()
gstlibvisual = library('gstlibvisual', gstlibvisual = library('gstlibvisual',
libvisual_sources, libvisual_sources,
c_args : gst_plugins_base_args, c_args : gst_plugins_base_args,

18
meson.build
View file

@ -143,18 +143,12 @@ gio_dep = dependency('gio-2.0', version : glib_req)
core_conf.set('HAVE_X', x11_dep.found()) core_conf.set('HAVE_X', x11_dep.found())
core_conf.set('HAVE_GIO_UNIX_2_0', giounix_dep.found()) core_conf.set('HAVE_GIO_UNIX_2_0', giounix_dep.found())
runcmd = run_command('pkg-config', '--variable=giomoduledir', 'gio-2.0') core_conf.set_quoted('GIO_MODULE_DIR',
if runcmd.returncode() == 0 gio_dep.get_pkgconfig_variable('giomoduledir'))
core_conf.set('GIO_MODULE_DIR', '"@0@"'.format(runcmd.stdout().strip())) core_conf.set_quoted('GIO_LIBDIR',
endif gio_dep.get_pkgconfig_variable('libdir'))
runcmd = run_command('pkg-config', '--variable=libdir', 'gio-2.0') core_conf.set_quoted('GIO_PREFIX',
if runcmd.returncode() == 0 gio_dep.get_pkgconfig_variable('prefix'))
core_conf.set('GIO_LIBDIR', '"@0@"'.format(runcmd.stdout().strip()))
endif
runcmd = run_command('pkg-config', '--variable=prefix', 'gio-2.0')
if runcmd.returncode() == 0
core_conf.set('GIO_PREFIX', '"@0@"'.format(runcmd.stdout().strip()))
endif
configinc = include_directories('.') configinc = include_directories('.')
libsinc = include_directories('gst-libs') libsinc = include_directories('gst-libs')