From 11db53c7b83079f3d01676041ab54a9556eb0ce5 Mon Sep 17 00:00:00 2001 From: Thibault Saunier Date: Fri, 25 Aug 2017 10:22:03 -0300 Subject: [PATCH] meson: Allow building the glib as a subproject --- meson.build | 7 ++++--- subprojects/glib.wrap | 5 +++++ 2 files changed, 9 insertions(+), 3 deletions(-) create mode 100644 subprojects/glib.wrap diff --git a/meson.build b/meson.build index 73b9e223f..93932c210 100644 --- a/meson.build +++ b/meson.build @@ -24,9 +24,10 @@ assemblyinfo='/AssemblyInfo.cs' gacutil = find_program('gacutil') al = find_program('al') -glib_dep = dependency('glib-2.0', version: glib_required_version) -gio_dep = dependency('gio-2.0', version: glib_required_version) -mono_runtime_dep = dependency('mono', required: false) +glib_dep = dependency('glib-2.0', version: glib_required_version, + fallback: ['glib', 'libglib_dep']) +gio_dep = dependency('gio-2.0', version: glib_required_version, + fallback: ['glib', 'libgio_dep']) # FIXME Check how to enabled debug flags (if at all needed). diff --git a/subprojects/glib.wrap b/subprojects/glib.wrap new file mode 100644 index 000000000..2ba08bdf8 --- /dev/null +++ b/subprojects/glib.wrap @@ -0,0 +1,5 @@ +[wrap-git] +directory=glib +url=git://git.gnome.org/glib +push-url=ssh://git.gnome.org/git/glib +revision=origin/master