From: Nehal J Wani <nehaljw.kkd1@gmail.com>
Date: Tue, 11 May 2021 00:19:04 +0000 (-0400)
Subject: CMake: propagate include flag for harfbuzz on Windows
X-Git-Tag: 3.0.0~130^2
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=3b8f5e0d4f7242dfd10e7ead41d1e1de273cedee;p=graphviz

CMake: propagate include flag for harfbuzz on Windows

Pango >=1.44.1 changed the way harfbuzz is included
xref: https://github.com/GNOME/pango/commit/a7b17aa2

This is not required on *nix because the PkgConfig CMake module
already takes care of this. For example, on Ubuntu it adds:
-I/usr/include/harbuzz to PangoCairo_CFLAGS
---

diff --git a/cmake/FindPangoCairo.cmake b/cmake/FindPangoCairo.cmake
index 96e692c8b..3bc002e6d 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,11 +24,13 @@ if(WIN32)
         GLIB_INCLUDE_DIR
         GLIBCONFIG_INCLUDE_DIR
         PangoCairo_INCLUDE_DIR
+        HARFBUZZ_INCLUDE_DIR
 
         GLIB_LIBRARY
         GOBJECT_LIBRARY
         PANGO_LIBRARY
         PangoCairo_LIBRARY
+        HARFBUZZ_LIBRARY
 
         GLIB_RUNTIME_LIBRARY
         GOBJECT_RUNTIME_LIBRARY
@@ -41,6 +45,7 @@ if(WIN32)
         ${GLIB_INCLUDE_DIR}
         ${GLIBCONFIG_INCLUDE_DIR}
         ${PangoCairo_INCLUDE_DIR}
+        ${HARFBUZZ_INCLUDE_DIR}
     )
 
     set(PangoCairo_LIBRARIES
@@ -55,6 +60,7 @@ if(WIN32)
         ${GOBJECT_LIBRARY}
         ${PANGO_LIBRARY}
         ${PangoCairo_LIBRARY}
+        ${HARFBUZZ_LIBRARY}
     )
 
     set(PangoCairo_RUNTIME_LIBRARIES