diff options
| author | Tobias Koenig <tokoe@kde.org> | 2006-07-01 21:02:05 +0000 |
|---|---|---|
| committer | Tobias Koenig <tokoe@kde.org> | 2006-07-01 21:02:05 +0000 |
| commit | 6c6631969b13a4a364b89a2b4fffb0abf26d9620 (patch) | |
| tree | 826dc6c7c5880f2a606203a8dac855bc352ac56d | |
| parent | c0ddc6259758bab84aa02bd3dc3f4586a8417331 (diff) | |
| download | extra-cmake-modules-6c6631969b13a4a364b89a2b4fffb0abf26d9620.tar.gz extra-cmake-modules-6c6631969b13a4a364b89a2b4fffb0abf26d9620.tar.bz2 | |
Make kdelibs compile with current qt4.2 snapshot
You have to update qt-copy to get compiled current trunk/kdelibs compiled
successfully.
CCMAIL:kde-core-devel@kde.org
svn path=/trunk/KDE/kdelibs/; revision=556896
| -rw-r--r-- | modules/FindQt4.cmake | 1 | ||||
| -rw-r--r-- | modules/FindQtDBus.cmake | 27 |
2 files changed, 1 insertions, 27 deletions
diff --git a/modules/FindQt4.cmake b/modules/FindQt4.cmake index 63b636ed..566cc9f5 100644 --- a/modules/FindQt4.cmake +++ b/modules/FindQt4.cmake @@ -503,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_RELEASE "-framework QtDBus" CACHE STRING "The QtBBus library.") SET(QT_QTDBUS_LIBRARY_DEBUG "-framework QtDBus" CACHE STRING "The QtBBus library.") diff --git a/modules/FindQtDBus.cmake b/modules/FindQtDBus.cmake deleted file mode 100644 index c0b5e6f7..00000000 --- a/modules/FindQtDBus.cmake +++ /dev/null @@ -1,27 +0,0 @@ -# - Try to find the QtDBus module -# Once done this will define -# -# QDBUS_FOUND - system has QtDBus -# QDBUS_INCLUDE_DIRS - the QtDBus include directories -# QDBUS_LIBRARIES - Link these to use QtDBus -# QDBUS_DEFINITIONS - Compiler switches required for using QtDBus -# -# QDBUS_IDL2CPP_EXECUTABLE - The adaptor/interface code generator -# QDBUS_CPP2XML_EXECUTABLE - The interface parser -# -# Macros (from QtDBusMacros.cmake): -# QDBUS_ADD_INTERFACES(SRC_VAR file1.xml ... fileN.xml) -# Generates interface code from the given XML files. -# -# QDBUS_GENERATE_INTERFACE(file.h) -# Generates the XML interface description from the given header file. -# -# QDBUS_ADD_ADAPTORS(SRC_VAR file1.xml ... fileN.xml) -# Generates adaptor code from the given XML files. -# -SET(QDBUS_FOUND) -SET(QDBUS_INCLUDE_DIRS ${QT_DBUS_INCLUDE_DIR}) -SET(QDBUS_LIBRARIES ${QT_QTDBUS_LIBRARY_DEBUG}) -SET(QDBUS_DEFINITIONS -I${QDBUS_INCLUDE_DIRS}) -SET(QDBUS_IDL2CPP_EXECUTABLE) -SET(QDBUS_CPP2XML_EXECUTABLE) |