From 5ab137b7e988db16ca7204e98869bca1b6442b25 Mon Sep 17 00:00:00 2001 From: Brad King Date: Fri, 8 May 2020 11:28:37 -0400 Subject: FindGTK2: Add harfbuzz target for dependency from pango Since commit effafca77e (FindGTK2: Add harfbuzz to GTK2_INCLUDE_DIRS, 2019-10-01, v3.16.0-rc1~22^2), pango's dependency on harfbuzz has been captured, but only for the `GTK2_INCLUDE_DIRS` and `GTK2_LIBRARIES` variables. Add the `GTK2::harfbuzz` imported target and update the `GTK2::pango` target to depend on it. Issue: #19531 --- Modules/FindGTK2.cmake | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/Modules/FindGTK2.cmake b/Modules/FindGTK2.cmake index 83091f3..600e4aa 100644 --- a/Modules/FindGTK2.cmake +++ b/Modules/FindGTK2.cmake @@ -708,11 +708,14 @@ foreach(_GTK2_component ${GTK2_FIND_COMPONENTS}) _GTK2_FIND_LIBRARY (CAIRO cairo false false) _GTK2_ADD_TARGET (CAIRO) + _GTK2_FIND_INCLUDE_DIR(HARFBUZZ hb.h) + _GTK2_FIND_LIBRARY (HARFBUZZ harfbuzz false false) + _GTK2_ADD_TARGET (HARFBUZZ) + _GTK2_FIND_INCLUDE_DIR(PANGO pango/pango.h) _GTK2_FIND_LIBRARY (PANGO pango false true) - _GTK2_ADD_TARGET (PANGO GTK2_DEPENDS gobject glib) - - _GTK2_FIND_INCLUDE_DIR(HARFBUZZ hb.h) + _GTK2_ADD_TARGET (PANGO GTK2_DEPENDS gobject glib + GTK2_OPTIONAL_DEPENDS harfbuzz) _GTK2_FIND_LIBRARY (PANGOCAIRO pangocairo false true) _GTK2_ADD_TARGET (PANGOCAIRO GTK2_DEPENDS pango cairo gobject glib) -- cgit v0.12