From 901a4b1332bef2333caa8008c1d176d3a87351c1 Mon Sep 17 00:00:00 2001 From: Nehal J Wani Date: Mon, 10 May 2021 20:19:04 -0400 Subject: [PATCH 7/7] Fix logic for finding harfbuzz Pango >=1.44.1 changed the way harfbuzz is included xref: https://github.com/GNOME/pango/commit/a7b17aa2 --- cmake/FindPangoCairo.cmake | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/cmake/FindPangoCairo.cmake b/cmake/FindPangoCairo.cmake index 69d82045b..23a9d8b50 100644 --- a/cmake/FindPangoCairo.cmake +++ b/cmake/FindPangoCairo.cmake @@ -4,11 +4,13 @@ if (WIN32) find_path(PangoCairo_INCLUDE_DIR pango/pangocairo.h PATH_SUFFIXES pango-1.0) find_path(GLIB_INCLUDE_DIR glib.h PATH_SUFFIXES glib-2.0) find_path(GLIBCONFIG_INCLUDE_DIR glibconfig.h PATH_SUFFIXES glib-2.0/include) + find_path(HARFBUZZ_INCLUDE_DIR hb.h PATH_SUFFIXES harfbuzz) find_library(GLIB_LIBRARY NAMES glib-2.0) find_library(GOBJECT_LIBRARY NAMES gobject-2.0) find_library(PANGO_LIBRARY NAMES pango-1.0) find_library(PangoCairo_LIBRARY NAMES pangocairo-1.0) + find_library(HARFBUZZ_LIBRARY NAMES harfbuzz) find_program(GLIB_RUNTIME_LIBRARY NAMES glib-2.dll) find_program(GOBJECT_RUNTIME_LIBRARY NAMES gobject-2.dll) @@ -22,17 +24,20 @@ if (WIN32) GLIB_INCLUDE_DIR GLIBCONFIG_INCLUDE_DIR PangoCairo_INCLUDE_DIR + HARFBUZZ_INCLUDE_DIR GLIB_LIBRARY GOBJECT_LIBRARY PANGO_LIBRARY PangoCairo_LIBRARY + HARFBUZZ_LIBRARY ) set(PangoCairo_INCLUDE_DIRS ${GLIB_INCLUDE_DIR} ${GLIBCONFIG_INCLUDE_DIR} ${PangoCairo_INCLUDE_DIR} + ${HARFBUZZ_INCLUDE_DIR} ) set(PangoCairo_LIBRARIES @@ -47,6 +52,7 @@ if (WIN32) ${GOBJECT_LIBRARY} ${PANGO_LIBRARY} ${PangoCairo_LIBRARY} + ${HARFBUZZ_LIBRARY} ) set(PangoCairo_RUNTIME_LIBRARIES -- 2.31.1