kolan
/
CMake
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge topic 'FindGTK2-pango-libs' 

73ba4e5 FindGTK2: Detect pangoft2 and pangoxft libraries
This commit is contained in:
Brad King 2013-08-02 08:18:28 -04:00 committed by CMake Topic Stage
parent 70fccc91dd 73ba4e5030
commit 3ec8136bae
1 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Modules/FindGTK2.cmake
View File

@ -77,7 +77,7 @@
# appropriate. A new set of _RELEASE variables was also added. # appropriate. A new set of _RELEASE variables was also added.
# * Remove GTK2_SKIP_MARK_AS_ADVANCED option, as now the variables are # * Remove GTK2_SKIP_MARK_AS_ADVANCED option, as now the variables are
# marked as advanced by SelectLibraryConfigurations # marked as advanced by SelectLibraryConfigurations
# * Detect gmodule library # * Detect gmodule, pangoft2 and pangoxft libraries
# Version 1.4 (10/4/2012) (CMake 2.8.10) # Version 1.4 (10/4/2012) (CMake 2.8.10)
# * 12596: Missing paths for FindGTK2 on NetBSD # * 12596: Missing paths for FindGTK2 on NetBSD
# * 12049: Fixed detection of GTK include files in the lib folder on # * 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_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_INCLUDE_DIR(GTK2_GDK_PIXBUF gdk-pixbuf/gdk-pixbuf.h)
_GTK2_FIND_LIBRARY (GTK2_GDK_PIXBUF gdk_pixbuf false true) _GTK2_FIND_LIBRARY (GTK2_GDK_PIXBUF gdk_pixbuf false true)