From 644a960605d4a23b766076bde2bc05e731c447ae Mon Sep 17 00:00:00 2001
From: tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da>
Date: Fri, 22 Jul 2011 20:48:13 +0000
Subject: [PATCH] kdebase: use pkgconfig to find dbus-tqt Thanks to "Nix" for
 the patch!

git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdebase@1242784 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
---
 ConfigureChecks.cmake      | 5 +++--
 kdm/backend/CMakeLists.txt | 7 +++++--
 ksmserver/CMakeLists.txt   | 5 +++--
 3 files changed, 11 insertions(+), 6 deletions(-)

diff --git a/ConfigureChecks.cmake b/ConfigureChecks.cmake
index f35de0c3a..9f525878d 100644
--- a/ConfigureChecks.cmake
+++ b/ConfigureChecks.cmake
@@ -189,9 +189,10 @@ if( BUILD_KDM OR BUILD_KSMSERVER )
   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>
diff --git a/kdm/backend/CMakeLists.txt b/kdm/backend/CMakeLists.txt
index ef3d4f709..c70353bd6 100644
--- a/kdm/backend/CMakeLists.txt
+++ b/kdm/backend/CMakeLists.txt
@@ -14,9 +14,12 @@
 include_directories(
   ${CMAKE_CURRENT_BINARY_DIR}
   ${CMAKE_BINARY_DIR}
-  ${DBUS_INCLUDE_DIRS}
+  ${DBUS_TQT_INCLUDE_DIRS}
 )
 
+link_directories(
+  ${DBUS_TQT_LIBRARY_DIRS}
+)
 
 ##### kdm (executable) ##########################
 
@@ -34,6 +37,6 @@ tde_add_executable( kdm
     process.c protodpy.c reset.c resource.c rpcauth.c
     server.c session.c sessreg.c socket.c streams.c
     util.c xdmauth.c xdmcp.c
-  LINK X11 ${XAU_LIBRARIES} ${DBUS_LIBRARIES} ${PAM_LIBRARY}
+  LINK X11 ${XAU_LIBRARIES} ${DBUS_TQT_LIBRARIES} ${PAM_LIBRARY}
   DESTINATION ${BIN_INSTALL_DIR}
 )
diff --git a/ksmserver/CMakeLists.txt b/ksmserver/CMakeLists.txt
index 3b4b6ff25..66a4b050b 100644
--- a/ksmserver/CMakeLists.txt
+++ b/ksmserver/CMakeLists.txt
@@ -19,12 +19,13 @@ include_directories(
   ${CMAKE_SOURCE_DIR}/kdmlib
   ${TDE_INCLUDE_DIR}
   ${TQT_INCLUDE_DIRS}
-  ${DBUS_INCLUDE_DIRS}
+  ${DBUS_TQT_INCLUDE_DIRS}
   ${HAL_INCLUDE_DIRS}
 )
 
 link_directories(
   ${TQT_LIBRARY_DIRS}
+  ${DBUS_TQT_LIBRARY_DIRS}
 )
 
 
@@ -42,5 +43,5 @@ tde_add_kdeinit_executable( ksmserver AUTOMOC
     main.cpp server.cpp shutdowndlg.cpp
     legacy.cpp startup.cpp shutdown.cpp client.cpp
     KSMServerInterface.skel server.skel timed.ui
-  LINK dmctl-static kdeui-shared ${HAL_LIBRARIES} ${DBUS_LIBRARIES}
+  LINK dmctl-static kdeui-shared ${HAL_LIBRARIES} ${DBUS_TQT_LIBRARIES}
 )