This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "CMake".
The branch, master has been updated
via d918b4a545fefd1593753189d83ec8590f430579 (commit)
via effafca77eacbb4988006b1f3f4d9154df6c33f8 (commit)
from 4a68c85073f80fd8f96c93eb5b3ead3058c84391 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=d918b4a545fefd1593753189d83ec8590f430579
commit d918b4a545fefd1593753189d83ec8590f430579
Merge: 4a68c85 effafca
Author: Brad King <brad.k...@kitware.com>
AuthorDate: Thu Oct 3 13:11:05 2019 +0000
Commit: Kitware Robot <kwro...@kitware.com>
CommitDate: Thu Oct 3 09:11:36 2019 -0400
Merge topic 'FindGTK2-harfbuzz'
effafca77e FindGTK2: Add harfbuzz to GTK2_INCLUDE_DIRS
Acked-by: Kitware Robot <kwro...@kitware.com>
Merge-request: !3877
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=effafca77eacbb4988006b1f3f4d9154df6c33f8
commit effafca77eacbb4988006b1f3f4d9154df6c33f8
Author: Markus Mittendrein <g...@maxmitti.tk>
AuthorDate: Tue Oct 1 23:06:02 2019 +0200
Commit: Brad King <brad.k...@kitware.com>
CommitDate: Wed Oct 2 11:31:44 2019 -0400
FindGTK2: Add harfbuzz to GTK2_INCLUDE_DIRS
Fixes: #19531
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)
-----------------------------------------------------------------------
Summary of changes:
Modules/FindGTK2.cmake | 3 +++
1 file changed, 3 insertions(+)
hooks/post-receive
--
CMake
_______________________________________________
Cmake-commits mailing list
Cmake-commits@cmake.org
https://cmake.org/mailman/listinfo/cmake-commits
