luc14n0/glib
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/glib.git synced 2025-10-25 06:22:15 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'meson-dependency-lookups' into 'main'

Browse Source 
meson: use builtin dependency lookups for zlib/intl

See merge request GNOME/glib!2685
This commit is contained in:
Philip Withnall
2022-05-26 12:57:20 +00:00
parent cdc5bf0227 c630b4a5bc
commit eacb41f62e
1 changed files with 1 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
meson.build
View File

@@ -2023,28 +2023,7 @@ endif
libm = cc.find_library('m', required : false)
libffi_dep = dependency('libffi', version : '>= 3.0.0', fallback : ['libffi', 'ffi_dep'])
if get_option('wrap_mode') == 'forcefallback'
# Respects "wrap_mode=forcefallback" option
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 cc.get_id() != 'msvc' and cc.get_id() != 'clang-cl'
libz_dep = cc.find_library('z', required : false)
else
libz_dep = cc.find_library('zlib1', required : false)
if not libz_dep.found()
libz_dep = cc.find_library('zlib', required : false)
endif
endif
if not libz_dep.found() or not cc.has_header('zlib.h')
libz_dep = subproject('zlib').get_variable('zlib_dep')
endif
endif
libz_dep = dependency('zlib')
# First check in libc, fallback to libintl, and as last chance build
# proxy-libintl subproject.