summaryrefslogtreecommitdiffstats
path: root/Modules/FindGTK2.cmake
diff options
context:
space:
mode:
authorDaniele E. Domenichelli <daniele.domenichelli@iit.it>2013-08-09 10:22:24 (GMT)
committerBrad King <brad.king@kitware.com>2013-10-08 14:30:12 (GMT)
commit61242ccc8f08594c51cfe1a7b699feedb0d666ad (patch)
tree9c22c0e3b0abc8722c4f754f21773459386985e8 /Modules/FindGTK2.cmake
parent4b876de9745dc147490eb5346aa8a6ed5391a7a5 (diff)
downloadCMake-61242ccc8f08594c51cfe1a7b699feedb0d666ad.zip
CMake-61242ccc8f08594c51cfe1a7b699feedb0d666ad.tar.gz
CMake-61242ccc8f08594c51cfe1a7b699feedb0d666ad.tar.bz2
FindGTK2: Fix gmodule, glibmm, pangoft2, and pangoxft targets
Diffstat (limited to 'Modules/FindGTK2.cmake')
-rw-r--r--Modules/FindGTK2.cmake11
1 files changed, 8 insertions, 3 deletions
diff --git a/Modules/FindGTK2.cmake b/Modules/FindGTK2.cmake
index fdd48b0..e20593e 100644
--- a/Modules/FindGTK2.cmake
+++ b/Modules/FindGTK2.cmake
@@ -628,7 +628,7 @@ foreach(_GTK2_component ${GTK2_FIND_COMPONENTS})
_GTK2_ADJUST_LIB_VARS (GTHREAD)
_GTK2_FIND_LIBRARY (GMODULE gmodule false true)
- _GTK2_ADJUST_LIB_VARS (MODULE)
+ _GTK2_ADJUST_LIB_VARS (GMODULE)
_GTK2_FIND_LIBRARY (GIO gio false true)
_GTK2_ADJUST_LIB_VARS (GIO)
@@ -646,7 +646,6 @@ foreach(_GTK2_component ${GTK2_FIND_COMPONENTS})
_GTK2_FIND_LIBRARY (GLIB glib false true)
_GTK2_ADJUST_LIB_VARS (GLIB)
- #_GTK2_ADD_TARGET_DEPENDS(GOBJECT glib)
_GTK2_ADD_TARGET_DEPENDS(GOBJECT glib)
_GTK2_ADD_TARGET_DEPENDS(ATK gobject glib)
_GTK2_ADD_TARGET_DEPENDS(GIO gobject glib)
@@ -657,6 +656,12 @@ foreach(_GTK2_component ${GTK2_FIND_COMPONENTS})
_GTK2_ADD_TARGET_LIBRARIES(CAIRO ${FREETYPE_LIBRARIES})
_GTK2_ADD_TARGET_DEPENDS(PANGO gobject glib)
_GTK2_ADD_TARGET_DEPENDS(PANGOCAIRO pango cairo gobject glib)
+ _GTK2_ADD_TARGET_DEPENDS(PANGOFT2 pango gobject glib)
+ _GTK2_ADD_TARGET_INCLUDE_DIRS(PANGOFT2 ${FREETYPE_INCLUDE_DIRS} ${GTK2_FONTCONFIG_INCLUDE_DIRS})
+ _GTK2_ADD_TARGET_LIBRARIES(PANGOFT2 ${FREETYPE_LIBRARIES})
+ _GTK2_ADD_TARGET_DEPENDS(PANGOXFT pangoft2 pango gobject glib)
+ _GTK2_ADD_TARGET_INCLUDE_DIRS(PANGOXFT ${FREETYPE_INCLUDE_DIRS} ${GTK2_FONTCONFIG_INCLUDE_DIRS})
+ _GTK2_ADD_TARGET_LIBRARIES(PANGOXFT ${FREETYPE_LIBRARIES})
_GTK2_ADD_TARGET_DEPENDS(GDK pangocairo pango cairo gdk_pixbuf gobject glib)
_GTK2_ADD_TARGET_DEPENDS(GTK gdk atk gio pangoft2 pangocairo pango cairo gdk_pixbuf gthread gobject glib)
@@ -701,7 +706,7 @@ foreach(_GTK2_component ${GTK2_FIND_COMPONENTS})
_GTK2_FIND_LIBRARY (SIGC++ sigc true true)
_GTK2_ADJUST_LIB_VARS (SIGC++)
- _GTK2_ADD_TARGET_DEPENDS(GLIBMM gobject sigc glib)
+ _GTK2_ADD_TARGET_DEPENDS(GLIBMM gobject sigc++ glib)
_GTK2_ADD_TARGET_DEPENDS(GIOMM gio glibmm gobject sigc glib)
_GTK2_ADD_TARGET_DEPENDS(ATKMM atk glibmm gobject sigc glib)
_GTK2_ADD_TARGET_DEPENDS(CAIROMM cairo sigc++)