diff options
| author | akashihi <akashihi@ffa7fe5e-494d-0410-b361-a75ebd5db220> | 2010-11-21 15:01:32 +0000 |
|---|---|---|
| committer | akashihi <akashihi@ffa7fe5e-494d-0410-b361-a75ebd5db220> | 2010-11-21 15:01:32 +0000 |
| commit | 38e3f0ce3458b9c5ecb8e288294a9ff728e1eb32 (patch) | |
| tree | 9c439bb0190730df6fae473fae4e007508df15e7 | |
| parent | d6bdd700d6ddc3dc8d5e459969c26a54d1dc21dd (diff) | |
| download | navit-38e3f0ce3458b9c5ecb8e288294a9ff728e1eb32.tar.gz | |
Fix:build:Fixed detection of gdk pixbuf on win32
git-svn-id: http://svn.code.sf.net/p/navit/code/trunk/navit@3698 ffa7fe5e-494d-0410-b361-a75ebd5db220
| -rw-r--r-- | cmake/FindGTK2.cmake | 51 |
1 files changed, 18 insertions, 33 deletions
diff --git a/cmake/FindGTK2.cmake b/cmake/FindGTK2.cmake index 6ec0976a6..a714bc607 100644 --- a/cmake/FindGTK2.cmake +++ b/cmake/FindGTK2.cmake @@ -116,21 +116,6 @@ else (GTK2_LIBRARIES AND GTK2_INCLUDE_DIRS) ) gtk2_debug_message("GTK2_GTKGL_INCLUDE_DIR is ${GTK2_GTKGL_INCLUDE_DIR}") - pkgconfig(libglade-2.0 _GLADEIncDir _GLADELinkDir _GLADELinkFlags _GLADECflags) - - find_path(GTK2_GLADE_INCLUDE_DIR - NAMES - glade/glade.h - PATHS - ${_GLADEIncDir} - ${_GLIB2IncDir} - /opt/gnome/include/libglade-2.0 - /usr/include/libglade-2.0 - /opt/include/libglade-2.0 - /sw/include/libglade-2.0 - ) - gtk2_debug_message("GTK2_GLADE_INCLUDE_DIR is ${GTK2_GLADE_INCLUDE_DIR}") - pkgconfig(pango _PANGOIncDir _PANGOLinkDir _PANGOLinkFlags _PANGOCflags) find_path(GTK2_PANGO_INCLUDE_DIR @@ -164,6 +149,24 @@ else (GTK2_LIBRARIES AND GTK2_INCLUDE_DIRS) ) gtk2_debug_message("GTK2_CAIRO_INCLUDE_DIR is ${GTK2_CAIRO_INCLUDE_DIR}") + pkgconfig(gdk-pixbuf-2.0 _GDKPIXBUFIncDir _GDKPIXBUFLinkDir _GDKPIXBUFLinkFlags _GDKPIXBUFCflags) + + find_path(GTK2_GDKPIXBUF_INCLUDE_DIR + NAMES + gdk-pixbuf/gdk-pixbuf.h + PATHS + ${_GDKPIXBUFIncDir} + ${_GDKPIXBUFIncDir}/gdk-pixbuf-2.0 + /opt/gnome/include/cairo + /usr/include + /usr/include/cairo + /opt/include + /opt/include/cairo + /sw/include + /sw/include/cairo + ) + gtk2_debug_message("GTK2_CAIRO_INCLUDE_DIR is ${GTK2_CAIRO_INCLUDE_DIR}") + pkgconfig(atk _ATKIncDir _ATKLinkDir _ATKLinkFlags _ATKCflags) find_path(GTK2_ATK_INCLUDE_DIR @@ -330,22 +333,6 @@ else (GTK2_LIBRARIES AND GTK2_INCLUDE_DIRS) ) gtk2_debug_message("GTK2_GTKGL_LIBRARY is ${GTK2_GTKGL_LIBRARY}") - find_library(GTK2_GLADE_LIBRARY - NAMES - glade-2.0 - PATHS - ${_GLIB2LinkDir} - ${_GLADELinkDir} - /usr/lib - /usr/local/lib - /usr/openwin/lib - /usr/X11R6/lib - /opt/gnome/lib - /opt/lib - /sw/lib - ) - gtk2_debug_message("GTK2_GLADE_LIBRARY is ${GTK2_GLADE_LIBRARY}") - find_library(GTK2_PANGO_LIBRARY NAMES pango-1.0 @@ -396,7 +383,6 @@ else (GTK2_LIBRARIES AND GTK2_INCLUDE_DIRS) ${GTK2_GLIBCONFIG_INCLUDE_DIR} ${GTK2_GLIB_INCLUDE_DIR} ${GTK2_GDK_INCLUDE_DIR} - ${GTK2_GLADE_INCLUDE_DIR} ${GTK2_PANGO_INCLUDE_DIR} ${GTK2_CAIRO_INCLUDE_DIR} ${GTK2_ATK_INCLUDE_DIR} @@ -419,7 +405,6 @@ else (GTK2_LIBRARIES AND GTK2_INCLUDE_DIRS) ${GTK2_GMODULE_LIBRARY} ${GTK2_GTHREAD_LIBRARY} ${GTK2_GOBJECT_LIBRARY} - ${GTK2_GLADE_LIBRARY} ${GTK2_PANGO_LIBRARY} ${GTK2_CAIRO_LIBRARY} ${GTK2_ATK_LIBRARY} |