diff options
| author | Alexander Neundorf <neundorf@kde.org> | 2009-11-23 23:02:13 +0000 |
|---|---|---|
| committer | Alexander Neundorf <neundorf@kde.org> | 2009-11-23 23:02:13 +0000 |
| commit | db0e350be6983f49776e7eae223284874d593bd8 (patch) | |
| tree | 9c04b0c1b802747c3a267a6350aecdc39eb8cec4 | |
| parent | 09bf2d93e473314638c84988f3294af443d2e694 (diff) | |
| download | extra-cmake-modules-db0e350be6983f49776e7eae223284874d593bd8.tar.gz extra-cmake-modules-db0e350be6983f49776e7eae223284874d593bd8.tar.bz2 | |
keep in sync with cmake: search for linguist and designer
Alex
svn path=/trunk/KDE/kdelibs/; revision=1053371
| -rw-r--r-- | modules/FindQt4.cmake | 19 |
1 files changed, 18 insertions, 1 deletions
diff --git a/modules/FindQt4.cmake b/modules/FindQt4.cmake index 0999931f..db774611 100644 --- a/modules/FindQt4.cmake +++ b/modules/FindQt4.cmake @@ -305,6 +305,8 @@ # QT_LUPDATE_EXECUTABLE Where to find the lupdate tool. # QT_LRELEASE_EXECUTABLE Where to find the lrelease tool. # QT_QCOLLECTIONGENERATOR_EXECUTABLE Where to find the qcollectiongenerator tool. +# QT_DESIGNER_EXECUTABLE Where to find the Qt designer tool. +# QT_LINGUIST_EXECUTABLE Where to find the Qt linguist tool. # # # These are around for backwards compatibility @@ -1023,6 +1025,8 @@ IF (QT4_QMAKE_FOUND) SET(QT_LUPDATE_EXECUTABLE NOTFOUND) SET(QT_LRELEASE_EXECUTABLE NOTFOUND) SET(QT_QCOLLECTIONGENERATOR_EXECUTABLE NOTFOUND) + SET(QT_DESIGNER_EXECUTABLE NOTFOUND) + SET(QT_LINGUIST_EXECUTABLE NOTFOUND) ENDIF(QT_QMAKE_CHANGED) FIND_PROGRAM(QT_MOC_EXECUTABLE @@ -1079,6 +1083,18 @@ IF (QT4_QMAKE_FOUND) NO_DEFAULT_PATH ) + FIND_PROGRAM(QT_DESIGNER_EXECUTABLE + NAMES designer-qt4 designer + PATHS ${QT_BINARY_DIR} + NO_DEFAULT_PATH + ) + + FIND_PROGRAM(QT_LINGUIST_EXECUTABLE + NAMES linguist-qt4 linguist + PATHS ${QT_BINARY_DIR} + NO_DEFAULT_PATH + ) + IF (QT_MOC_EXECUTABLE) SET(QT_WRAP_CPP "YES") ENDIF (QT_MOC_EXECUTABLE) @@ -1091,7 +1107,8 @@ IF (QT4_QMAKE_FOUND) MARK_AS_ADVANCED( QT_UIC_EXECUTABLE QT_UIC3_EXECUTABLE QT_MOC_EXECUTABLE QT_RCC_EXECUTABLE QT_DBUSXML2CPP_EXECUTABLE QT_DBUSCPP2XML_EXECUTABLE - QT_LUPDATE_EXECUTABLE QT_LRELEASE_EXECUTABLE QT_QCOLLECTIONGENERATOR_EXECUTABLE) + QT_LUPDATE_EXECUTABLE QT_LRELEASE_EXECUTABLE QT_QCOLLECTIONGENERATOR_EXECUTABLE + QT_DESIGNER_EXECUTABLE QT_LINGUIST_EXECUTABLE) # get the directory of the current file, used later on in the file |