diff options
| -rw-r--r-- | CMakeLists.txt | 8 | ||||
| -rw-r--r-- | cmake/FindDBus.cmake | 26 | ||||
| -rw-r--r-- | cmake/FindDBusGLib.cmake | 23 |
3 files changed, 53 insertions, 4 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 4d1e9c94..82c7c549 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -30,6 +30,7 @@ find_package(OpenGL) find_package(GTK2 2.6 COMPONENTS gtk) find_package(Gettext) find_package(PNG) +find_package(DBusGLib) #Qt detection SET(QT_USE_QTSVG TRUE) SET(QT_USE_QTXML TRUE) @@ -40,7 +41,6 @@ find_package(PkgConfig) if(PKG_CONFIG_FOUND) pkg_check_modules(QUESOGLC quesoglc) pkg_check_modules(LIBGPSD libgpsd) - pkg_check_modules(DBUS_GLIB dbus-glib-1) endif(PKG_CONFIG_FOUND) #Simple checks CHECK_INCLUDE_FILES(wordexp.h HAVE_WORDEXP) @@ -150,9 +150,9 @@ if (GYPSY_FOUND) add_module(vehicle/gypsy "gypsy lib found" TRUE) endif(GYPSY_FOUND) -if(DBUS_GLIB_FOUND) - include_directories(${DBUS_GLIB_INCLUDE_DIRS}) - list(APPEND NAVIT_LIBS ${DBUS_GLIB_LIBRARIES}) +if(DBusGLib_FOUND) + include_directories(${DBusGLib_INCLUDE_DIRS}) + list(APPEND NAVIT_LIBS ${DBusGLib_LIBRARIES}) add_module(binding/dbus "dbus-glib-1 found" TRUE) add_module(speech/dbus "dbus-glib-1 found" TRUE) add_module(vehicle/gpsd_dbus "dbus-glib-1 found" TRUE) 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) |