meson: move some dependency checks to the top level

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

diff --git a/meson.build b/meson.build
index 88a488a..6c48353 100644 (file)
--- a/meson.build
+++ b/meson.build
@@ -201,6 +201,12 @@ glib_deps = [dependency('glib-2.0', version : glib_req, fallback: ['glib', 'libg
              dependency('gobject-2.0', fallback: ['glib', 'libgobject_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_GIO_UNIX_2_0',
     (gio_dep.type_name() != 'pkgconfig' and host_machine.system() != 'windows')

diff --git a/tests/examples/meson.build b/tests/examples/meson.build
index a3f3f0b..6d97a5c 100644 (file)
--- a/tests/examples/meson.build
+++ b/tests/examples/meson.build
@@ -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('audio')
 subdir('dynamic')