diff options
| author | rikky <rikky@ffa7fe5e-494d-0410-b361-a75ebd5db220> | 2011-01-02 22:59:11 +0000 |
|---|---|---|
| committer | rikky <rikky@ffa7fe5e-494d-0410-b361-a75ebd5db220> | 2011-01-02 22:59:11 +0000 |
| commit | 3177ea870ba8f57fcc3d3083c3d277e3c96b97cd (patch) | |
| tree | 17c6e8d0defdaec1bfb64484482bb3e51ee5080f /cmake | |
| parent | 1db35b492ad5a8c6c2f290c24115b5ff5d6eade4 (diff) | |
| download | navit-svn-3177ea870ba8f57fcc3d3083c3d277e3c96b97cd.tar.gz | |
Fix:Build:Replace more pkg-config stuff (dbus-glib) to improve cross-compiling
git-svn-id: http://svn.code.sf.net/p/navit/code/trunk/navit@3847 ffa7fe5e-494d-0410-b361-a75ebd5db220
Diffstat (limited to 'cmake')
| -rw-r--r-- | cmake/FindDBus.cmake | 26 | ||||
| -rw-r--r-- | cmake/FindDBusGLib.cmake | 23 |
2 files changed, 49 insertions, 0 deletions
diff --git a/cmake/FindDBus.cmake b/cmake/FindDBus.cmake new file mode 100644 index 00000000..b6bbdb53 --- /dev/null +++ b/cmake/FindDBus.cmake @@ -0,0 +1,26 @@ +include(LibFindMacros) + +libfind_pkg_check_modules(DBUS_PKGCONFIG dbus-1) + +FIND_PATH(DBus_INCLUDE_DIR dbus/dbus.h + PATHS + ${DBUS_PKGCONFIG_INCLUDE_DIRS} + /usr/include/dbus-1.0 +# PATH_SUFFIXES dbus +) + +FIND_PATH(DBus_INCLUDE_DIR_ARCH dbus/dbus-arch-deps.h + PATHS + ${DBUS_PKGCONFIG_INCLUDE_DIRS} + /usr/lib/dbus-1.0/include +# PATH_SUFFIXES dbus +) + +FIND_LIBRARY(DBus_LIBRARY + NAMES dbus-1 + PATHS ${DBUS_PKGCONFIG_LIBRARY_DIRS} +) + +set(DBus_PROCESS_INCLUDES DBus_INCLUDE_DIR DBus_INCLUDE_DIR_ARCH) +set(DBus_PROCESS_LIBS DBus_LIBRARY) +libfind_process(DBus) diff --git a/cmake/FindDBusGLib.cmake b/cmake/FindDBusGLib.cmake new file mode 100644 index 00000000..e4e87007 --- /dev/null +++ b/cmake/FindDBusGLib.cmake @@ -0,0 +1,23 @@ +FIND_PACKAGE(DBus) + +include(LibFindMacros) + +libfind_pkg_check_modules(DBUS_GLIB_PKGCONFIG dbus-glib-1) + +FIND_PATH(DBusGLib_INCLUDE_DIR dbus/dbus-glib.h + PATHS + ${DBUS_GLIB_PKGCONFIG_INCLUDE_DIRS} + /usr/include/dbus-1.0 +# PATH_SUFFIXES dbus +) + +FIND_LIBRARY(DBusGLib_LIBRARY + NAMES + dbus-glib-1 + PATHS + ${DBUS_GLIB_PKGCONFIG_LIBRARY_DIRS} +) + +set(DBusGLib_PROCESS_INCLUDES DBusGLib_INCLUDE_DIR DBus_INCLUDE_DIRS) +set(DBusGLib_PROCESS_LIBS DBusGLib_LIBRARY DBus_LIBRARIES) +libfind_process(DBusGLib) |