luc14n0/glib
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/glib.git synced 2025-02-23 18:52:09 +01:00
Code Issues Packages Projects Releases Wiki Activity

meson: Use internal not-found dependency for dependencies

Browse Source 
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
This commit is contained in:
Nirbheek Chauhan 2018-08-08 00:18:45 +05:30
parent bc0d624245
commit 9330c4a9d8
1 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
gio/meson.build
View File

@ -845,11 +845,10 @@ libgio_dep = declare_dependency(link_with : libgio,
include_directories : [configinc, gioinc]) include_directories : [configinc, gioinc])
if host_system == 'windows' if host_system == 'windows'
# Hack till https://github.com/mesonbuild/meson/issues/2324 is fixed libgiounix_dep = declare_dependency()
libgiounix_dep = dependency('', required : false)
libgiowin32_dep = libgio_dep libgiowin32_dep = libgio_dep
else else
libgiowin32_dep = dependency('', required : false) libgiowin32_dep = declare_dependency()
libgiounix_dep = libgio_dep libgiounix_dep = libgio_dep
endif endif