diff options
| author | Tobias Koenig <tokoe@kde.org> | 2006-07-01 22:02:09 +0000 |
|---|---|---|
| committer | Tobias Koenig <tokoe@kde.org> | 2006-07-01 22:02:09 +0000 |
| commit | 8818afd3899d3a24d1039323c17ea5981bb9418e (patch) | |
| tree | 0fe9054aa695acbc80cf03eec001338844c8887a | |
| parent | 6c6631969b13a4a364b89a2b4fffb0abf26d9620 (diff) | |
| download | extra-cmake-modules-8818afd3899d3a24d1039323c17ea5981bb9418e.tar.gz extra-cmake-modules-8818afd3899d3a24d1039323c17ea5981bb9418e.tar.bz2 | |
Make kdecore link against QtDBus, thanks to Alex for his help on debugging!
svn path=/trunk/KDE/kdelibs/; revision=556914
| -rw-r--r-- | modules/FindKDE4Internal.cmake | 2 | ||||
| -rw-r--r-- | modules/FindQt4.cmake | 24 |
2 files changed, 23 insertions, 3 deletions
diff --git a/modules/FindKDE4Internal.cmake b/modules/FindKDE4Internal.cmake index 3c4f0939..53722f39 100644 --- a/modules/FindKDE4Internal.cmake +++ b/modules/FindKDE4Internal.cmake @@ -168,7 +168,7 @@ INCLUDE (MacroEnsureVersion) cmake_minimum_required(VERSION 2.4.1 FATAL_ERROR) -set(QT_MIN_VERSION "4.1.1") +set(QT_MIN_VERSION "4.2.0") #this line includes FindQt4.cmake, which searches the Qt library and headers find_package(Qt4 REQUIRED) diff --git a/modules/FindQt4.cmake b/modules/FindQt4.cmake index 566cc9f5..4bcddef1 100644 --- a/modules/FindQt4.cmake +++ b/modules/FindQt4.cmake @@ -36,6 +36,7 @@ # QT_QTGUI_FOUND True if QtGui was found. # QT_QT3SUPPORT_FOUND True if Qt3Support was found. # QT_QTASSISTANT_FOUND True if QtAssistant was found. +# QT_QTDBUS_FOUND True if QtDBus was found. # QT_QTDESIGNER_FOUND True if QtDesigner was found. # QT_QTMOTIF_FOUND True if QtMotif was found. # QT_QTNETWORK_FOUND True if QtNetwork was found. @@ -60,6 +61,7 @@ # QT_QTASSISTANT_INCLUDE_DIR Path to "include/QtAssistant" # QT_QTCORE_INCLUDE_DIR Path to "include/QtCore" # QT_QTDESIGNER_INCLUDE_DIR Path to "include/QtDesigner" +# QT_QTDBUS_INCLUDE_DIR Path to "include/QtDBus" # QT_QTGUI_INCLUDE_DIR Path to "include/QtGui" # QT_QTMOTIF_INCLUDE_DIR Path to "include/QtMotif" # QT_QTNETWORK_INCLUDE_DIR Path to "include/QtNetwork" @@ -90,6 +92,10 @@ # QT_QTCORE_LIBRARY_RELEASE # QT_QTCORE_LIBRARY_DEBUG # +# The QtDBus library: QT_QTDBUS_LIBRARY +# QT_QTDBUS_LIBRARY_RELEASE +# QT_QTDBUS_LIBRARY_DEBUG +# # The QtDesigner library: QT_QTDESIGNER_LIBRARY # QT_QTDESIGNER_LIBRARY_RELEASE # QT_QTDESIGNER_LIBRARY_DEBUG @@ -143,6 +149,8 @@ # QT_UIC_EXECUTABLE Where to find the uic tool. # QT_UIC3_EXECUTABLE Where to find the uic3 tool. # QT_RCC_EXECUTABLE Where to find the rcc tool +# QT_DBUSCPP2XML_EXECUTABLE Where to find the dbuscpp2xml tool. +# QT_DBUSXML2CPP_EXECUTABLE Where to find the dbusxml2cpp tool. # # QT_DOC_DIR Path to "doc" of Qt4 # QT_MKSPECS_DIR Path to "mkspecs" of Qt4 @@ -463,8 +471,8 @@ IF (QT4_QMAKE_FOUND) NO_DEFAULT_PATH ) - # Set QT_DBUS_INCLUDE_DIR - FIND_PATH(QT_DBUS_INCLUDE_DIR QtDBus + # Set QT_QTDBUS_INCLUDE_DIR + FIND_PATH(QT_QTDBUS_INCLUDE_DIR QtDBus PATHS ${QT_INCLUDE_DIR}/QtDBus ${QT_HEADERS_DIR}/QtDBus @@ -697,6 +705,18 @@ IF (QT4_QMAKE_FOUND) NO_DEFAULT_PATH ) + FIND_PROGRAM(QT_DBUSCPP2XML_EXECUTABLE + NAMES dbuscpp2xml + PATHS ${QT_BINARY_DIR} + NO_DEFAULT_PATH + ) + + FIND_PROGRAM(QT_DBUSXML2CPP_EXECUTABLE + NAMES dbusxml2cpp + PATHS ${QT_BINARY_DIR} + NO_DEFAULT_PATH + ) + IF (QT_MOC_EXECUTABLE) SET(QT_WRAP_CPP "YES") ENDIF (QT_MOC_EXECUTABLE) |