From aadcd3ed8af0ca8eac77a4aacd746be703d55a15 Mon Sep 17 00:00:00 2001 From: Ebrahim Byagowi Date: Wed, 1 Jul 2020 14:31:33 +0430 Subject: [PATCH] [meson] use dependency's has_headers to make pulled cairo has ft support --- meson.build | 18 ++++++------------ 1 file changed, 6 insertions(+), 12 deletions(-) diff --git a/meson.build b/meson.build index 40a77f277..70cf55a2c 100644 --- a/meson.build +++ b/meson.build @@ -151,18 +151,12 @@ if not get_option('cairo').disabled() if cairo_dep.type_name() == 'pkgconfig' cairo_ft_dep = dependency('cairo-ft', required: get_option('cairo')) else - cairo_ft_dep = cairo_dep - # TODO: Apparently the following isn't reliable to detect whether a dependency provides - # something or not so let's assume it is always enabled as we control - # cairo subproject anyway for now. To fix and test run .ci/build-win32.sh and - # make sure hb-view.exe is not missing. - # - # if cpp.has_header('cairo-ft.h') and \ - # cpp.has_function('cairo_ft_font_face_create_for_ft_face', dependencies: cairo_dep) - # cairo_ft_dep = cairo_dep - # else - # cairo_ft_dep = dependency('', required: false) - # endif + cairo_ft_dep = dependency('cairo', fallback: ['cairo', 'libcairo_dep'], + has_headers: ['cairo-ft.h'], + required: get_option('cairo')) + if cairo_ft_dep.found() + cairo_dep = cairo_ft_dep + endif endif else cairo_ft_dep = dependency('', required: false)