From c4bbe89b53570025f00d2302e56e1396229716ad Mon Sep 17 00:00:00 2001 From: Xavier Claessens Date: Wed, 24 Jun 2020 13:40:55 -0400 Subject: [PATCH] meson: Fallback to freetype2 subproject when option is 'auto' But disable harfbuzz support when configuring freetype2 subproject to avoid dependency cycle. --- meson.build | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/meson.build b/meson.build index 59d05266d..566291a9e 100644 --- a/meson.build +++ b/meson.build @@ -76,8 +76,9 @@ if not get_option('freetype').disabled() has_headers: ['ft2build.h'], ) endif - if not freetype_dep.found() and get_option('freetype').enabled() - freetype_dep = dependency('freetype2', fallback: ['freetype2', 'freetype_dep']) + if not freetype_dep.found() + freetype_dep = dependency('freetype2', fallback: ['freetype2', 'freetype_dep'], + default_options: ['harfbuzz=disabled']) endif else freetype_dep = dependency('', required: false)