[Cmake-commits] CMake branch, next, updated. v2.8.11.2-3574-gbd1c269

[Daniele E. Domenichelli]

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, next has been updated
       via  bd1c269eba532e0b5576daa8342326b5ea3f270d (commit)
       via  73ba4e5030c0c6ea40643f67622b0e0b754651c8 (commit)
      from  89085f34117364031de9d17e0b22f18563680d64 (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 -----------------------------------------------------------------
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=bd1c269eba532e0b5576daa8342326b5ea3f270d
commit bd1c269eba532e0b5576daa8342326b5ea3f270d
Merge: 89085f3 73ba4e5
Author:     Daniele E. Domenichelli <daniele.domenichelli at gmail.com>
AuthorDate: Thu Aug 1 10:57:52 2013 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Thu Aug 1 10:57:52 2013 -0400

    Merge topic 'FindGTK2-pango-libs' into next
    
    73ba4e5 FindGTK2: Detect pangoft2 and pangoxft libraries


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=73ba4e5030c0c6ea40643f67622b0e0b754651c8
commit 73ba4e5030c0c6ea40643f67622b0e0b754651c8
Author:     Daniele E. Domenichelli <daniele.domenichelli at iit.it>
AuthorDate: Wed Jul 31 18:29:16 2013 +0200
Commit:     Daniele E. Domenichelli <daniele.domenichelli at iit.it>
CommitDate: Thu Aug 1 16:54:32 2013 +0200

    FindGTK2: Detect pangoft2 and pangoxft libraries

diff --git a/Modules/FindGTK2.cmake b/Modules/FindGTK2.cmake
index f7d3bf8..77aac6d 100644
--- a/Modules/FindGTK2.cmake
+++ b/Modules/FindGTK2.cmake
@@ -77,7 +77,7 @@
 #     appropriate. A new set of _RELEASE variables was also added.
 #   * Remove GTK2_SKIP_MARK_AS_ADVANCED option, as now the variables are
 #     marked as advanced by SelectLibraryConfigurations
-#   * Detect gmodule library
+#   * Detect gmodule, pangoft2 and pangoxft libraries
 # Version 1.4 (10/4/2012) (CMake 2.8.10)
 #   * 12596: Missing paths for FindGTK2 on NetBSD
 #   * 12049: Fixed detection of GTK include files in the lib folder on
@@ -478,6 +478,10 @@ foreach(_GTK2_component ${GTK2_FIND_COMPONENTS})
 
         _GTK2_FIND_LIBRARY    (GTK2_PANGOCAIRO pangocairo false true)
 
+        _GTK2_FIND_LIBRARY    (GTK2_PANGOFT2 pangoft2 false true)
+
+        _GTK2_FIND_LIBRARY    (GTK2_PANGOXFT pangoxft false true)
+
         _GTK2_FIND_INCLUDE_DIR(GTK2_GDK_PIXBUF gdk-pixbuf/gdk-pixbuf.h)
         _GTK2_FIND_LIBRARY    (GTK2_GDK_PIXBUF gdk_pixbuf false true)
 

-----------------------------------------------------------------------

Summary of changes:
 Modules/FindGTK2.cmake |    6 +++++-
 1 files changed, 5 insertions(+), 1 deletions(-)


hooks/post-receive
-- 
CMake