SVN commit 535756 by thiago: Update the detection mechanism to use the new pkg-config file for QtDBus.
Since QtDBus depends on Qt, this means Qt must be found using pkg-config, regardless of how FindQt4.cmake finds it. CCMAIL:[email protected] M +4 -3 FindQtDBus.cmake --- branches/work/kdelibs4-dbus/cmake/modules/FindQtDBus.cmake #535755:535756 @@ -13,12 +13,13 @@ INCLUDE(UsePkgConfig) PKGCONFIG("dbus-1" _dbusIncDir _dbusLinkDir _dbusLinkFlags _dbusCflags) +PKGCONFIG("dbus-qt4-1" _qdbusIncDir _qdbusLinkDir _qdbusLinkFlags _qdbusCflags) -set(QDBUS_DEFINITIONS ${_dbusCflags}) -set(QDBUS_INCLUDE_DIRS ${_dbusIncDir}) +set(QDBUS_DEFINITIONS ${_dbusCflags} ${_qdbusCflags}) +set(QDBUS_INCLUDE_DIRS ${_dbusIncDir} ${_qdbusIncDir}) FIND_LIBRARY(QDBUS_LIBRARIES NAMES dbus-qt4-1 - PATHS ${_dbusLinkDir} + PATHS ${_qdbusLinkDir} ) if (QDBUS_INCLUDE_DIRS AND QDBUS_LIBRARIES) _______________________________________________ Kde-buildsystem mailing list [email protected] https://mail.kde.org/mailman/listinfo/kde-buildsystem
