luc14n0/glib
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/glib.git synced 2025-03-31 12:53:07 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'zlib-forcefallback' into 'master'

Browse Source 
meson: Use subproject zlib if "wrap_mode=forcefallback" was specified

See merge request GNOME/glib!1959
This commit is contained in:
Philip Withnall 2021-02-24 11:23:36 +00:00
commit 48322e878b
1 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
meson.build
View File

@ -2004,9 +2004,15 @@ endif
libm = cc.find_library('m', required : false) libm = cc.find_library('m', required : false)
libffi_dep = dependency('libffi', version : '>= 3.0.0', fallback : ['libffi', 'ffi_dep']) libffi_dep = dependency('libffi', version : '>= 3.0.0', fallback : ['libffi', 'ffi_dep'])
# Don't use the bundled ZLib sources until we are sure that we can't find it on if get_option('wrap_mode') == 'forcefallback'
# the system # Respects "wrap_mode=forcefallback" option
libz_dep = dependency('zlib', required : false) libz_dep = subproject('zlib').get_variable('zlib_dep')
else
# Don't use the bundled ZLib sources until we are sure that we can't find it on
# the system
libz_dep = dependency('zlib', required : false)
endif
if not libz_dep.found() if not libz_dep.found()
if cc.get_id() != 'msvc' and cc.get_id() != 'clang-cl' if cc.get_id() != 'msvc' and cc.get_id() != 'clang-cl'
libz_dep = cc.find_library('z', required : false) libz_dep = cc.find_library('z', required : false)