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

But disable harfbuzz support when configuring freetype2 subproject to avoid dependency cycle.
5 years ago · c4bbe89b53
parent 33252ce576
commit c4bbe89b53
1 changed files with 3 additions and 2 deletions
--- 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)