diff options
| -rw-r--r-- | Modules/FindGTK2.cmake | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/Modules/FindGTK2.cmake b/Modules/FindGTK2.cmake index fdd48b0a2b..e20593e93c 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++) |