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

meson: Fallback to freetype2 subproject when option is 'auto' 

But disable harfbuzz support when configuring freetype2 subproject to
avoid dependency cycle.
This commit is contained in:
Xavier Claessens 2020-06-24 13:40:55 -04:00 committed by Ebrahim Byagowi
parent 33252ce576
commit c4bbe89b53
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
meson.build
View File

@ -76,8 +76,9 @@ if not get_option('freetype').disabled()
has_headers: ['ft2build.h'], ) has_headers: ['ft2build.h'], )
endif endif
if not freetype_dep.found() and get_option('freetype').enabled() if not freetype_dep.found()
freetype_dep = dependency('freetype2', fallback: ['freetype2', 'freetype_dep']) freetype_dep = dependency('freetype2', fallback: ['freetype2', 'freetype_dep'],
default_options: ['harfbuzz=disabled'])
endif endif
else else
freetype_dep = dependency('', required: false) freetype_dep = dependency('', required: false)