[Navit-cvs-commit] SF.net SVN: navit:[4535] trunk/navit/cmake

[<mar...@us...>]

Revision: 4535
          http://navit.svn.sourceforge.net/navit/?rev=4535&view=rev
Author:   martin-s
Date:     2011-06-16 22:05:51 +0000 (Thu, 16 Jun 2011)

Log Message:
-----------
Fix:Build:Fix gtk builds on win32

Modified Paths:
--------------
    trunk/navit/cmake/FindGTK2.cmake
    trunk/navit/cmake/FindGlib.cmake

Modified: trunk/navit/cmake/FindGTK2.cmake
===================================================================
--- trunk/navit/cmake/FindGTK2.cmake	2011-06-16 19:57:39 UTC (rev 4534)
+++ trunk/navit/cmake/FindGTK2.cmake	2011-06-16 22:05:51 UTC (rev 4535)
@@ -164,6 +164,7 @@
         /opt/include/cairo
         /sw/include
         /sw/include/cairo
+        /sw/include/gdk-pixbuf-2.0
     )
     gtk2_debug_message("GTK2_CAIRO_INCLUDE_DIR is ${GTK2_CAIRO_INCLUDE_DIR}")
 

Modified: trunk/navit/cmake/FindGlib.cmake
===================================================================
--- trunk/navit/cmake/FindGlib.cmake	2011-06-16 19:57:39 UTC (rev 4534)
+++ trunk/navit/cmake/FindGlib.cmake	2011-06-16 22:05:51 UTC (rev 4535)
@@ -13,21 +13,21 @@
 # Main include dir
 find_path(Glib_INCLUDE_DIR
   NAMES glib.h
-  PATHS ${Glib_PKGCONF_INCLUDE_DIRS}
+  PATHS ${Glib_PKGCONF_INCLUDE_DIRS} /sw/include
   PATH_SUFFIXES glib-2.0
 )
 
 # Glib-related libraries also use a separate config header, which is in lib dir
 find_path(GlibConfig_INCLUDE_DIR
   NAMES glibconfig.h
-  PATHS ${Glib_PKGCONF_INCLUDE_DIRS} /usr
+  PATHS ${Glib_PKGCONF_INCLUDE_DIRS} /usr /sw
   PATH_SUFFIXES lib/glib-2.0/include
 )
 
 # Finally the library itself
 find_library(Glib_LIBRARY
   NAMES glib-2.0
-  PATHS ${Glib_PKGCONF_LIBRARY_DIRS}
+  PATHS ${Glib_PKGCONF_LIBRARY_DIRS} /sw/lib
 )
 
 # Set the include dir variables and the libraries and let libfind_process do the rest.


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.