From d64635a7606f2b69eba55c6563cec9cc37926c13 Mon Sep 17 00:00:00 2001 From: Chun-wei Fan Date: Wed, 28 Mar 2018 11:32:53 +0800 Subject: [PATCH] build: Defer defining HAVE_PANGOFT and HAVE_HARFBUZZ We forgot to account for the case where we lookup for HarfBuzz manually under Visual Studio builds, so only set HAVE_HARFBUZZ (and thus HAVE_PANGOFT, since PangoFT2 depends on HarfBuzz) after we did the fallback check for HarfBuzz. Also, check for hb.h instead of harfbuzz/hb.h to be inline with the pkg-config case, as the sources also include the HarfBuzz header by using #include , not #include https://bugzilla.gnome.org/show_bug.cgi?id=773299 --- meson.build | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/meson.build b/meson.build index 62df80db98..b5c4fa166e 100644 --- a/meson.build +++ b/meson.build @@ -371,9 +371,6 @@ else platform_gio_dep = giounix_dep endif -cdata.set('HAVE_HARFBUZZ', harfbuzz_dep.found()) -cdata.set('HAVE_PANGOFT', pangoft_dep.found()) - if iso_codes_dep.found() cdata.set_quoted('ISO_CODES_PREFIX', iso_codes_dep.get_pkgconfig_variable('prefix')) else @@ -435,12 +432,15 @@ if cc.get_id() == 'msvc' # Fallback for HarfBuzz if not harfbuzz_dep.found() - if cc.has_header('harfbuzz/hb.h') + if cc.has_header('hb.h') harfbuzz_dep = cc.find_library('harfbuzz', required : false) endif endif endif +cdata.set('HAVE_HARFBUZZ', harfbuzz_dep.found()) +cdata.set('HAVE_PANGOFT', pangoft_dep.found()) + atk_pkgs = ['atk'] wayland_pkgs = []