diff options
| author | Emmanuele Bassi <ebassi@gnome.org> | 2023-01-09 00:56:09 +0000 |
|---|---|---|
| committer | Emmanuele Bassi <ebassi@gnome.org> | 2023-01-09 00:56:09 +0000 |
| commit | d705faab0d633a1d21b66c9f12ec236e58ab19a5 (patch) | |
| tree | 72db3b0bb94bac35b1db0574dc95afc474ca319a | |
| parent | 6701ee3b6e551479c894fa92eaae06b32ddc2507 (diff) | |
| download | gobject-introspection-d705faab0d633a1d21b66c9f12ec236e58ab19a5.tar.gz | |
build: Remove subproject fallback
We don't need it any more.
| -rw-r--r-- | meson.build | 22 |
1 files changed, 8 insertions, 14 deletions
diff --git a/meson.build b/meson.build index d31e79f8..b7b646ca 100644 --- a/meson.build +++ b/meson.build @@ -127,26 +127,20 @@ endif glib_micro_version = 0 # gi_version[2] glib_version = '>=2.@0@.@1@'.format(gi_versions[1], glib_micro_version) -glib_dep = dependency('glib-2.0', version : glib_version, - fallback: ['glib', 'libglib_dep']) -gobject_dep = dependency('gobject-2.0', version : glib_version, - fallback: ['glib', 'libgobject_dep']) -gio_dep = dependency('gio-2.0', version : glib_version, - fallback: ['glib', 'libgio_dep']) -gmodule_dep = dependency('gmodule-2.0', version : glib_version, - fallback: ['glib', 'libgmodule_dep']) +glib_dep = dependency('glib-2.0', version: glib_version) +gobject_dep = dependency('gobject-2.0', version: glib_version) +gio_dep = dependency('gio-2.0', version: glib_version) +gmodule_dep = dependency('gmodule-2.0', version: glib_version) if host_system != 'windows' - giounix_dep = dependency('gio-unix-2.0', version : glib_version, - fallback: ['glib', 'libgiounix_dep']) - giowin_dep = dependency('', required : false) + giounix_dep = dependency('gio-unix-2.0', version: glib_version) + giowin_dep = disabler() else # Don't even try to look for gio-unix-2.0 on Windows because Meson will # fruitlessly try to find it in the glib subproject even when we don't want # it to look in the subproject at all. Just use a not-found dependency. - giounix_dep = dependency('', required : false) + giounix_dep = disabler() # XXX: Autotools doesn't build girs for gio-win32-2.0, but maybe we should? - giowin_dep = dependency('gio-windows-2.0', version : glib_version, - fallback: ['glib', 'libgiowin32_dep']) + giowin_dep = dependency('gio-windows-2.0', version: glib_version) endif # We either get libffi from the system, or from GLib's own subproject |