diff options
| author | martin-s <martin-s@ffa7fe5e-494d-0410-b361-a75ebd5db220> | 2013-02-15 22:16:02 +0000 |
|---|---|---|
| committer | martin-s <martin-s@ffa7fe5e-494d-0410-b361-a75ebd5db220> | 2013-02-15 22:16:02 +0000 |
| commit | 8c21202e3720dbc4284f25fba4965ac1f3e575fb (patch) | |
| tree | 71f3ea1fc87ef51ded9d6c8377796a3b07ef1841 | |
| parent | 71251f4acdd831f062b9f091a4611bd4772de953 (diff) | |
| download | navit-8c21202e3720dbc4284f25fba4965ac1f3e575fb.tar.gz | |
Fix:Build:Add imlib2 check to cmake
git-svn-id: http://svn.code.sf.net/p/navit/code/trunk/navit@5377 ffa7fe5e-494d-0410-b361-a75ebd5db220
| -rwxr-xr-x | CMakeLists.txt | 4 | ||||
| -rw-r--r-- | config.h.cmake | 2 | ||||
| -rw-r--r-- | navit/graphics/gtk_drawing_area/CMakeLists.txt | 1 |
3 files changed, 7 insertions, 0 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index b1a327266..043b7b27f 100755 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -134,6 +134,10 @@ if(PKG_CONFIG_FOUND) pkg_check_modules(LIBOSSO libosso) pkg_check_modules(LIBGPS19 libgps>=2.90) pkg_check_modules(LIBGARMIN libgarmin) + pkg_check_modules(IMLIB2 imlib2) + if(IMLIB2_FOUND) + set(HAVE_IMLIB2 1) + endif(IMLIB2_FOUND) endif(PKG_CONFIG_FOUND) #Simple checks CHECK_INCLUDE_FILES(wordexp.h HAVE_WORDEXP) diff --git a/config.h.cmake b/config.h.cmake index 7959d8e27..770b4a52a 100644 --- a/config.h.cmake +++ b/config.h.cmake @@ -90,3 +90,5 @@ #cmakedefine USE_OPENGLES2 1 #cmakedefine HAVE_SHMEM 1 + +#cmakedefine HAVE_IMLIB2 1 diff --git a/navit/graphics/gtk_drawing_area/CMakeLists.txt b/navit/graphics/gtk_drawing_area/CMakeLists.txt index dd313809b..19e442616 100644 --- a/navit/graphics/gtk_drawing_area/CMakeLists.txt +++ b/navit/graphics/gtk_drawing_area/CMakeLists.txt @@ -1,2 +1,3 @@ +set(graphics_gtk_drawing_area_LIBS ${IMLIB2_LDFLAGS} ${GTK2_LIBRARIES}) module_add_library(graphics_gtk_drawing_area graphics_gtk_drawing_area.c) |