diff options
| author | Nirbheek Chauhan <nirbheek@centricular.com> | 2017-11-30 22:33:42 +0530 |
|---|---|---|
| committer | Nirbheek Chauhan <nirbheek@centricular.com> | 2018-03-10 19:05:19 +0530 |
| commit | 1a0aa3731cad90ea395a37500ee2bca78f8e95dd (patch) | |
| tree | 7e07344d7e202f158454afefff6a69c517b22663 | |
| parent | 52a5c7eb4e63f45a9d982de81515bbf7e13e3fd5 (diff) | |
| download | gobject-introspection-1a0aa3731cad90ea395a37500ee2bca78f8e95dd.tar.gz | |
meson: Don't look for gio-unix-2.0 on Windows
As reported by guruDanny76[1], this was causing meson to always clone
the glib subproject and fruitlessly try to find gio-unix-2.0, so just
don't even try.
1. https://github.com/wingtk/gvsbuild/issues/22#issuecomment-348139054
| -rw-r--r-- | meson.build | 14 |
1 files changed, 11 insertions, 3 deletions
diff --git a/meson.build b/meson.build index 244897c4..637964c3 100644 --- a/meson.build +++ b/meson.build @@ -32,7 +32,7 @@ endforeach add_project_arguments(['-DHAVE_CONFIG_H'], language: 'c') gi_hidden_visibility_cflags = [] -if host_machine.system() == 'windows' +if host_system == 'windows' config.set('DLL_EXPORT', true) config.set('_GI_EXTERN', '__declspec(dllexport) extern') if cc.get_id() != 'msvc' @@ -59,8 +59,16 @@ 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']) -giounix_dep = dependency('gio-unix-2.0', version : glib_version, - fallback: ['glib', 'libgiounix_dep'], required: false) +if host_system != 'windows' + giounix_dep = dependency('gio-unix-2.0', version : glib_version, + fallback: ['glib', 'libgiounix_dep']) +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) + # XXX: Autotools doesn't build girs for gio-win32-2.0, but maybe we should? +endif libffi_dep = dependency('libffi', fallback : ['libffi', 'ffi_dep']) |