diff options
| author | Nirbheek Chauhan <nirbheek@centricular.com> | 2018-08-08 00:18:45 +0530 |
|---|---|---|
| committer | Nirbheek Chauhan <nirbheek@centricular.com> | 2018-08-08 00:18:45 +0530 |
| commit | 9330c4a9d8415679fa7372513f87f19e21ddef8a (patch) | |
| tree | 65d0407bfa62f8eb7704210f0b1493291195b115 | |
| parent | bc0d62424579f507f8d7af13bd29b6d86723f65f (diff) | |
| download | glib-nirbheek/use-internal-dependency-for-not-found-deps.tar.gz | |
meson: Use internal not-found dependency for dependenciesnirbheek/use-internal-dependency-for-not-found-deps
Otherwise when other projects such as gstreamer try to use giounix_dep
on Windows with a version check, meson errors out.
This is a Meson bug, but this is more correct since the type of the
dependency is now the same in all cases and it will take a while for
the fix to propagate anyway.
See: https://github.com/mesonbuild/meson/pull/3987
| -rw-r--r-- | gio/meson.build | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/gio/meson.build b/gio/meson.build index 4b2c8f2ca..5987a3f76 100644 --- a/gio/meson.build +++ b/gio/meson.build @@ -845,11 +845,10 @@ libgio_dep = declare_dependency(link_with : libgio, include_directories : [configinc, gioinc]) if host_system == 'windows' - # Hack till https://github.com/mesonbuild/meson/issues/2324 is fixed - libgiounix_dep = dependency('', required : false) + libgiounix_dep = declare_dependency() libgiowin32_dep = libgio_dep else - libgiowin32_dep = dependency('', required : false) + libgiowin32_dep = declare_dependency() libgiounix_dep = libgio_dep endif |