diff options
| author | martin-s <martin-s@ffa7fe5e-494d-0410-b361-a75ebd5db220> | 2011-01-08 17:58:11 +0000 |
|---|---|---|
| committer | martin-s <martin-s@ffa7fe5e-494d-0410-b361-a75ebd5db220> | 2011-01-08 17:58:11 +0000 |
| commit | afc03d28cf3e6fa5368a82eaad86ed6ff71f1192 (patch) | |
| tree | b0cb2014131a6477ea88016a1546a21788ebec0e | |
| parent | b44b2cfad3316102076d0c4a6d17b21702c72ac8 (diff) | |
| download | navit-svn-afc03d28cf3e6fa5368a82eaad86ed6ff71f1192.tar.gz | |
Fix:Build:Check for gmodule
git-svn-id: http://svn.code.sf.net/p/navit/code/trunk/navit@3889 ffa7fe5e-494d-0410-b361-a75ebd5db220
| -rw-r--r-- | CMakeLists.txt | 6 | ||||
| -rw-r--r-- | cmake/FindGmodule.cmake | 28 | ||||
| -rw-r--r-- | config.h.cmake | 1 |
3 files changed, 35 insertions, 0 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index b0a8dc74..0c350e7a 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -50,6 +50,7 @@ INCLUDE (CheckIncludeFiles) INCLUDE (CheckLibraryExists) INCLUDE (CheckFunctionExists) find_package(Glib) +find_package(Gmodule) find_package(ZLIB) find_package(Freetype) find_package(SDL) @@ -87,6 +88,11 @@ if (Glib_FOUND) else(Glib_FOUND) set_with_reason(support/glib "Glib not found" TRUE) endif(Glib_FOUND) +if (Gmodule_FOUND) + set(HAVE_GMODULE 1) + include_directories(${Gmodule_INCLUDE_DIRS}) + list(APPEND NAVIT_LIBS ${Gmodule_LIBRARIES}) +endif(Gmodule_FOUND) if(ZLIB_FOUND) set(HAVE_ZLIB 1) include_directories(${ZLIB_INCLUDE_DIRS}) diff --git a/cmake/FindGmodule.cmake b/cmake/FindGmodule.cmake new file mode 100644 index 00000000..2d5ddd0b --- /dev/null +++ b/cmake/FindGmodule.cmake @@ -0,0 +1,28 @@ +# - Try to find Glib-2.0 (with gobject) +# Once done, this will define +# +# Glib_FOUND - system has Glib +# Glib_INCLUDE_DIRS - the Glib include directories +# Glib_LIBRARIES - link these to use Glib + +include(LibFindMacros) + +libfind_pkg_check_modules(Gmodule_PKGCONF gmodule-2.0) +# Main include dir +find_path(Gmodule_INCLUDE_DIR + NAMES gmodule.h + PATHS ${Gmodule_PKGCONF_INCLUDE_DIRS} + PATH_SUFFIXES gmodule-2.0 +) + +# Finally the modulerary itself +find_library(Gmodule_LIBRARY + NAMES gmodule-2.0 + PATHS ${Gmodule_PKGCONF_LIBRARY_DIRS} +) + +# Set the include dir variables and the libraries and let libfind_process do the rest. +# NOTE: Singular variables for this library, plural for libraries this this lib depends on. +set(Gmodule_PROCESS_INCLUDES Gmodule_INCLUDE_DIR) +set(Gmodule_PROCESS_LIBS Gmodule_LIBRARY) +libfind_process(Gmodule) diff --git a/config.h.cmake b/config.h.cmake index 8d1938ea..276d9949 100644 --- a/config.h.cmake +++ b/config.h.cmake @@ -6,6 +6,7 @@ #cmakedefine HAVE_API_WIN32 1 #cmakedefine HAVE_API_WIN32_CE 1 #cmakedefine HAVE_GLIB 1 +#cmakedefine HAVE_GMODULE 1 #cmakedefine HAVE_GETCWD 1 #cmakedefine CACHE_SIZE @CACHE_SIZE@ #cmakedefine AVOID_FLOAT 1 |