summaryrefslogtreecommitdiff
path: root/cmake/modules
diff options
context:
space:
mode:
authorAndre Moreira Magalhaes (andrunko) <andre.magalhaes@collabora.co.uk>2011-12-14 13:43:01 -0200
committerAndre Moreira Magalhaes (andrunko) <andre.magalhaes@collabora.co.uk>2011-12-15 21:35:09 -0200
commit093c8a4c5f9fbe55cb13d746b6213fda388b3ca2 (patch)
treeba55ff4c17ab5fbab321dffea8b8a478ce8afd6f /cmake/modules
parent1088fd94794099008c74dab5a32375f7d6b63a0b (diff)
cmake: Fix FindDBusGLib.cmake to properly search for dbus-glib-1 instead of dbus-glib.
Diffstat (limited to 'cmake/modules')
-rw-r--r--cmake/modules/FindDBusGLib.cmake8
1 files changed, 6 insertions, 2 deletions
diff --git a/cmake/modules/FindDBusGLib.cmake b/cmake/modules/FindDBusGLib.cmake
index af4bbe8c..cb942202 100644
--- a/cmake/modules/FindDBusGLib.cmake
+++ b/cmake/modules/FindDBusGLib.cmake
@@ -18,9 +18,13 @@ endif(DBUS_GLIB_INCLUDE_DIR AND DBUS_GLIB_LIBRARIES)
find_package(PkgConfig)
if(PKG_CONFIG_FOUND)
if (DBusGLib_FIND_VERSION_EXACT)
- pkg_check_modules(PC_DBUS_GLIB QUIET dbus-glib=${DBusGLib_FIND_VERSION})
+ pkg_check_modules(PC_DBUS_GLIB QUIET dbus-glib-1=${DBusGLib_FIND_VERSION})
else (DBusGLib_FIND_VERSION_EXACT)
- pkg_check_modules(PC_DBUS_GLIB QUIET dbus-glib>=${DBusGLib_FIND_VERSION})
+ if (DBusGLib_FIND_VERSION)
+ pkg_check_modules(PC_DBUS_GLIB REQUIRED dbus-glib-1>=${DBusGLib_FIND_VERSION})
+ else (DBusGLib_FIND_VERSION)
+ pkg_check_modules(PC_DBUS_GLIB REQUIRED dbus-glib-1)
+ endif (DBusGLib_FIND_VERSION)
endif (DBusGLib_FIND_VERSION_EXACT)
endif(PKG_CONFIG_FOUND)