mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2025-01-03 14:08:56 +00:00
Code Issues 1 Projects Releases Wiki Activity

meson: move some dependency checks to the top level

Browse source 
The newly-added build definitions for test/icles relied
on dependencies that were only defined when the examples
are enabled, thus breaking meson build -Ddisable_examples=true
This commit is contained in:
Mathieu Duponchelle 2018-04-18 17:22:45 +02:00
parent 4d40ac3fc5
commit d767773a47
2 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
meson.build
View file

@ -201,6 +201,12 @@ glib_deps = [dependency('glib-2.0', version : glib_req, fallback: ['glib', 'libg
dependency('gobject-2.0', fallback: ['glib', 'libgobject_dep'])] dependency('gobject-2.0', fallback: ['glib', 'libgobject_dep'])]
gio_dep = dependency('gio-2.0', fallback: ['glib', 'libgio_dep']) gio_dep = dependency('gio-2.0', fallback: ['glib', 'libgio_dep'])
# some of the examples want GTK+
gtk_dep = dependency('gtk+-3.0', version : '>= 3.10', required : false)
gtk_x11_dep = dependency('gtk+-x11-3.0', version : '>= 3.10', required : false)
gtk_quartz_dep = dependency('gtk+-quartz-3.0', version : '>= 3.10', required : false)
gdk_pixbuf_dep = dependency('gdk-pixbuf-2.0', required : false)
core_conf.set('HAVE_X', x11_dep.found()) core_conf.set('HAVE_X', x11_dep.found())
core_conf.set('HAVE_GIO_UNIX_2_0', core_conf.set('HAVE_GIO_UNIX_2_0',
(gio_dep.type_name() != 'pkgconfig' and host_machine.system() != 'windows') (gio_dep.type_name() != 'pkgconfig' and host_machine.system() != 'windows')

6
tests/examples/meson.build
View file

@ -1,9 +1,3 @@
# some of the examples want GTK+
gtk_dep = dependency('gtk+-3.0', version : '>= 3.10', required : false)
gtk_x11_dep = dependency('gtk+-x11-3.0', version : '>= 3.10', required : false)
gtk_quartz_dep = dependency('gtk+-quartz-3.0', version : '>= 3.10', required : false)
gdk_pixbuf_dep = dependency('gdk-pixbuf-2.0', required : false)
subdir('app') subdir('app')
subdir('audio') subdir('audio')
subdir('dynamic') subdir('dynamic')