summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBrad King <brad.king@kitware.com>2019-10-03 13:11:05 (GMT)
committerKitware Robot <kwrobot@kitware.com>2019-10-03 13:11:36 (GMT)
commitd918b4a545fefd1593753189d83ec8590f430579 (patch)
tree11d906b61a4ac6d119a46687a1fc1d510224654f
parent4a68c85073f80fd8f96c93eb5b3ead3058c84391 (diff)
parenteffafca77eacbb4988006b1f3f4d9154df6c33f8 (diff)
downloadCMake-d918b4a545fefd1593753189d83ec8590f430579.zip
CMake-d918b4a545fefd1593753189d83ec8590f430579.tar.gz
CMake-d918b4a545fefd1593753189d83ec8590f430579.tar.bz2
Merge topic 'FindGTK2-harfbuzz'
effafca77e FindGTK2: Add harfbuzz to GTK2_INCLUDE_DIRS Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !3877
-rw-r--r--Modules/FindGTK2.cmake3
1 files changed, 3 insertions, 0 deletions
diff --git a/Modules/FindGTK2.cmake b/Modules/FindGTK2.cmake
index e3af676..83091f3 100644
--- a/Modules/FindGTK2.cmake
+++ b/Modules/FindGTK2.cmake
@@ -259,6 +259,7 @@ function(_GTK2_FIND_INCLUDE_DIR _var _hdr)
gtkmm-2.4
libglade-2.0
libglademm-2.4
+ harfbuzz
pango-1.0
pangomm-1.4
sigc++-2.0
@@ -711,6 +712,8 @@ foreach(_GTK2_component ${GTK2_FIND_COMPONENTS})
_GTK2_FIND_LIBRARY (PANGO pango false true)
_GTK2_ADD_TARGET (PANGO GTK2_DEPENDS gobject glib)
+ _GTK2_FIND_INCLUDE_DIR(HARFBUZZ hb.h)
+
_GTK2_FIND_LIBRARY (PANGOCAIRO pangocairo false true)
_GTK2_ADD_TARGET (PANGOCAIRO GTK2_DEPENDS pango cairo gobject glib)