walkero
/
harfbuzz
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

[meson] minor

This commit is contained in:
Ebrahim Byagowi 2020-07-06 22:27:39 +04:30 committed by GitHub
parent 13d78b50f2
commit ddb103ea1a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 11 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
meson.build
View File

@ -1,7 +1,10 @@
project('harfbuzz', 'c', 'cpp', project('harfbuzz', 'c', 'cpp',
meson_version: '>= 0.53.0', meson_version: '>= 0.53.0',
version: '2.6.8', version: '2.6.8',
default_options: ['cpp_std=c++11', 'wrap_mode=nofallback'], default_options: [
'cpp_std=c++11',
'wrap_mode=nofallback', # https://github.com/harfbuzz/harfbuzz/pull/2548
],
) )
warning('Meson is not our main build system for building *nix packages yet we encourage packagers to test it and give us feedback about it.') warning('Meson is not our main build system for building *nix packages yet we encourage packagers to test it and give us feedback about it.')
@ -224,7 +227,7 @@ if fontconfig_dep.found()
endif endif
gdi_uniscribe_deps = [] gdi_uniscribe_deps = []
# GDI (uniscribe) (windows) # GDI (Uniscribe) (Windows)
if host_machine.system() == 'windows' and not get_option('gdi').disabled() if host_machine.system() == 'windows' and not get_option('gdi').disabled()
# TODO: make nicer once we have https://github.com/mesonbuild/meson/issues/3940 # TODO: make nicer once we have https://github.com/mesonbuild/meson/issues/3940
if cpp.has_header('usp10.h') and cpp.has_header('windows.h') if cpp.has_header('usp10.h') and cpp.has_header('windows.h')
@ -238,7 +241,7 @@ if host_machine.system() == 'windows' and not get_option('gdi').disabled()
endif endif
endif endif
# DirectWrite (windows) # DirectWrite (Windows)
directwrite_dep = null_dep directwrite_dep = null_dep
if host_machine.system() == 'windows' and not get_option('directwrite').disabled() if host_machine.system() == 'windows' and not get_option('directwrite').disabled()
if cpp.has_header('dwrite_1.h') if cpp.has_header('dwrite_1.h')
@ -307,7 +310,6 @@ foreach check : check_funcs
found = true found = true
# First try without linking # First try without linking
found = cpp.has_function(name, dependencies: check_deps) found = cpp.has_function(name, dependencies: check_deps)
if not found and link_withs.length() > 0 if not found and link_withs.length() > 0