luc14n0/glib
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/glib.git synced 2025-03-01 13:42:10 +01:00
Code Issues Packages Projects Releases Wiki Activity

meson: Allow using libffi and zlib as subprojects

Browse Source 
Also use the python3 module to find python3, and require Meson 0.37.1
This commit is contained in:
Nirbheek Chauhan 2017-03-21 16:49:09 +05:30 committed by Matthias Clasen
parent 2f792f6484
commit eb07a2c87d
1 changed files with 4 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
meson.build
View File

@ -1,6 +1,6 @@
project('glib', 'c', 'cpp', project('glib', 'c', 'cpp',
version : '2.51.2', version : '2.51.2',
meson_version : '>= 0.36.0', meson_version : '>= 0.37.1',
default_options : [ default_options : [
'warning_level=1', 'warning_level=1',
'c_std=gnu89' 'c_std=gnu89'
@ -1274,8 +1274,8 @@ pcre = dependency('libpcre', required : false) # Should check for Unicode suppor
glib_conf.set('USE_SYSTEM_PCRE', pcre.found()) glib_conf.set('USE_SYSTEM_PCRE', pcre.found())
libm = cc.find_library('m', required : false) libm = cc.find_library('m', required : false)
libffi_dep = dependency('libffi', version : '>= 3.0.0') libffi_dep = dependency('libffi', version : '>= 3.0.0', fallback : ['libffi', 'ffi_dep'])
libz_dep = dependency('zlib') libz_dep = dependency('zlib', fallback : ['zlib', 'zlib_dep'])
# Only used on non-glibc targets # Only used on non-glibc targets
libintl = cc.find_library('intl', required : false) libintl = cc.find_library('intl', required : false)
@ -1302,13 +1302,7 @@ endif
# Needed for glib-mkenums # Needed for glib-mkenums
perl = find_program('perl') perl = find_program('perl')
python = find_program('python3', required : false) python = import('python3').find_python()
if not python.found()
# All our scripts are compatible with python 2, so it's ok if this is Python 2
# Also, we don't check for 'python2' because if the user doesn't have Python
# installed, we want them to see that we want 'python', not 'python2'.
python = find_program('python')
endif
# FIXME: defines in config.h that are not actually used anywhere # FIXME: defines in config.h that are not actually used anywhere
# (we add them for now to minimise the diff) # (we add them for now to minimise the diff)