This looks for dbus-tqt using pkg-config, rather than explicitly
hardwiring it (though the compilation test is retained).
This fixes the case where dbus-tqt is installed using a different prefix
from Qt or dbus itself. This is fairly common these days (I have kde3
installed in /usr/kde3, but Qt3 is installed in /usr, because non-KDE3
programs need it.)
It requires my previous dbus-tqt pkgconfig patch.
Index: ConfigureChecks.cmake
===================================================================
--- ConfigureChecks.cmake (revision 1242239)
+++ ConfigureChecks.cmake (working copy)
@@ -189,9 +189,10 @@
endif( )
# check for dbus-tqt
+ pkg_check_modules( DBUS_TQT REQUIRED dbus-tqt )
tde_save( CMAKE_REQUIRED_INCLUDES CMAKE_REQUIRED_LIBRARIES )
- set( CMAKE_REQUIRED_INCLUDES ${QT_INCLUDE_DIRS} ${TQT_INCLUDE_DIRS}
${DBUS_INCLUDE_DIRS} )
- set( CMAKE_REQUIRED_LIBRARIES ${TQT_LDFLAGS} )
+ set( CMAKE_REQUIRED_INCLUDES ${DBUS_TQT_INCLUDE_DIRS} ${TQT_INCLUDE_DIRS}
${QT_INCLUDE_DIRS})
+ set( CMAKE_REQUIRED_LIBRARIES ${DBUS_TQT_LDFLAGS} ${TQT_LDFLAGS} ${QT_LDFLAGS} )
check_cxx_source_compiles("
#include <tqt.h>
#include <dbus/connection.h>
--
NULL && (void)