From d767773a479abea616ca1b80cdb4a180b2fc99c5 Mon Sep 17 00:00:00 2001 From: Mathieu Duponchelle Date: Wed, 18 Apr 2018 17:22:45 +0200 Subject: [PATCH] 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 --- meson.build | 6 ++++++ tests/examples/meson.build | 6 ------ 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/meson.build b/meson.build index 88a488aaf8..6c483530ef 100644 --- 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 a3f3f0b3af..6d97a5c441 100644 --- 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')