diff options
| author | martin-s <martin-s@ffa7fe5e-494d-0410-b361-a75ebd5db220> | 2011-06-16 22:05:51 +0000 |
|---|---|---|
| committer | martin-s <martin-s@ffa7fe5e-494d-0410-b361-a75ebd5db220> | 2011-06-16 22:05:51 +0000 |
| commit | 6aa08217ff615c45f3de8157c3e1421316ef4f8f (patch) | |
| tree | da7a5d00cb318f17445114f63a6b336e202d3a5a /cmake | |
| parent | 0601b0814a1362582293a9512e8a987a2467dd5e (diff) | |
| download | navit-6aa08217ff615c45f3de8157c3e1421316ef4f8f.tar.gz | |
Fix:Build:Fix gtk builds on win32
git-svn-id: http://svn.code.sf.net/p/navit/code/trunk/navit@4535 ffa7fe5e-494d-0410-b361-a75ebd5db220
Diffstat (limited to 'cmake')
| -rw-r--r-- | cmake/FindGTK2.cmake | 1 | ||||
| -rw-r--r-- | cmake/FindGlib.cmake | 6 |
2 files changed, 4 insertions, 3 deletions
diff --git a/cmake/FindGTK2.cmake b/cmake/FindGTK2.cmake index 7828c8adf..fc6b6710c 100644 --- a/cmake/FindGTK2.cmake +++ b/cmake/FindGTK2.cmake @@ -164,6 +164,7 @@ else (GTK2_LIBRARIES AND GTK2_INCLUDE_DIRS) /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}") diff --git a/cmake/FindGlib.cmake b/cmake/FindGlib.cmake index d3547d51d..43414ff54 100644 --- a/cmake/FindGlib.cmake +++ b/cmake/FindGlib.cmake @@ -13,21 +13,21 @@ libfind_pkg_check_modules(Glib_PKGCONF glib-2.0) # 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. |