From 77c8d3d6a592f090e281852711bb10c6d7badf1f Mon Sep 17 00:00:00 2001 From: Thiago Macieira Date: Fri, 30 Jun 2006 10:50:02 +0000 Subject: This is safe to add. svn path=/trunk/KDE/kdelibs/; revision=556460 --- modules/FindQt4.cmake | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/modules/FindQt4.cmake b/modules/FindQt4.cmake index 95cd5578..63b636ed 100644 --- a/modules/FindQt4.cmake +++ b/modules/FindQt4.cmake @@ -463,6 +463,14 @@ IF (QT4_QMAKE_FOUND) NO_DEFAULT_PATH ) + # Set QT_DBUS_INCLUDE_DIR + FIND_PATH(QT_DBUS_INCLUDE_DIR QtDBus + PATHS + ${QT_INCLUDE_DIR}/QtDBus + ${QT_HEADERS_DIR}/QtDBus + NO_DEFAULT_PATH + ) + # Make variables changeble to the advanced user MARK_AS_ADVANCED( QT_LIBRARY_DIR QT_INCLUDE_DIR QT_QT_INCLUDE_DIR QT_DOC_DIR) @@ -495,6 +503,7 @@ IF (QT4_QMAKE_FOUND) SET(QT_QTXML_LIBRARY_DEBUG "-framework QtXml" CACHE STRING "The QtXml library.") SET(QT_QTSVG_LIBRARY_RELEASE "-framework QtSvg" CACHE STRING "The QtSvg library.") SET(QT_QTSVG_LIBRARY_DEBUG "-framework QtSvg" CACHE STRING "The QtSvg library.") + SET(QT_QTDBUS_LIBRARY_DEBUG "-framework QtDBus" CACHE STRING "The QtBBus library.") # WTF? why don't we have frameworks? :P @@ -556,6 +565,9 @@ IF (QT4_QMAKE_FOUND) FIND_LIBRARY(QT_QTTEST_LIBRARY_RELEASE NAMES QtTest QtTest4 PATHS ${QT_LIBRARY_DIR} NO_DEFAULT_PATH) FIND_LIBRARY(QT_QTTEST_LIBRARY_DEBUG NAMES QtTest_debug QtTest_debug4 QtTestd4 PATHS ${QT_LIBRARY_DIR} NO_DEFAULT_PATH) + FIND_LIBRARY(QT_QTDBUS_LIBRARY_RELEASE NAMES QtDBus QtDBus4 PATHS ${QT_LIBRARY_DIR} NO_DEFAULT_PATH) + FIND_LIBRARY(QT_QTDBUS_LIBRARY_DEBUG NAMES QtDBus_debug QtDBus_debug4 QtDBusd4 PATHS ${QT_LIBRARY_DIR} NO_DEFAULT_PATH) + MARK_AS_ADVANCED(QT_QT3SUPPORT_LIBRARY QT_QTGUI_LIBRARY ) ENDIF (QT_USE_FRAMEWORKS) @@ -641,6 +653,7 @@ IF (QT4_QMAKE_FOUND) _QT4_ADJUST_LIB_VARS(QTSVG) _QT4_ADJUST_LIB_VARS(QTUITOOLS) _QT4_ADJUST_LIB_VARS(QTTEST) + _QT4_ADJUST_LIB_VARS(QTDBUS) ####################################### # -- cgit v1.2.1