From 00c652adab5e1be9a3c35a0cc60f1684ca6bb81b Mon Sep 17 00:00:00 2001 From: Xavier Claessens Date: Wed, 24 Jun 2020 14:11:32 -0400 Subject: [PATCH] meson: Fallback to cairo subproject when option is 'auto' --- meson.build | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/meson.build b/meson.build index f91ab2efd..d159058b1 100644 --- a/meson.build +++ b/meson.build @@ -129,7 +129,11 @@ if not get_option('cairo').disabled() has_headers: ['cairo.h']) endif - if not cairo_dep.found() and get_option('cairo').enabled() + if not cairo_dep.found() + # Note that we don't have harfbuzz -> cairo -> freetype2 -> harfbuzz fallback + # dependency cycle here because we have configured freetype2 above with + # harfbuzz support disabled, so when cairo will lookup freetype2 dependency + # it will be forced to use that one. cairo_dep = dependency('cairo', fallback: ['cairo', 'libcairo_dep']) endif