diff options
| author | Brad King <brad.king@kitware.com> | 2013-08-02 12:18:28 (GMT) |
|---|---|---|
| committer | CMake Topic Stage <kwrobot@kitware.com> | 2013-08-02 12:18:28 (GMT) |
| commit | 3ec8136baeb735c9e3123c6fd561ddacd7843721 (patch) | |
| tree | 314ca240121d5ff05ea2afea62e9267370e95acd | |
| parent | 70fccc91dd9b6374e18b8522571f385814fc38df (diff) | |
| parent | 73ba4e5030c0c6ea40643f67622b0e0b754651c8 (diff) | |
| download | CMake-3ec8136baeb735c9e3123c6fd561ddacd7843721.zip CMake-3ec8136baeb735c9e3123c6fd561ddacd7843721.tar.gz CMake-3ec8136baeb735c9e3123c6fd561ddacd7843721.tar.bz2 | |
Merge topic 'FindGTK2-pango-libs'
73ba4e5 FindGTK2: Detect pangoft2 and pangoxft libraries
| -rw-r--r-- | Modules/FindGTK2.cmake | 6 |
1 files changed, 5 insertions, 1 deletions
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) |