diff options
| author | Alexander Neundorf <neundorf@kde.org> | 2006-03-22 19:04:54 +0000 |
|---|---|---|
| committer | Alexander Neundorf <neundorf@kde.org> | 2006-03-22 19:04:54 +0000 |
| commit | 2761044f193b57a45caa2f8b17b42fd2e2ee18ce (patch) | |
| tree | 450b8c5cfd4f3e14d30e780cd294bb3bbfe105f2 | |
| parent | 7f6e63dc8dcc33fb0ab5c0bff8d500fca0346188 (diff) | |
| download | extra-cmake-modules-2761044f193b57a45caa2f8b17b42fd2e2ee18ce.tar.gz extra-cmake-modules-2761044f193b57a45caa2f8b17b42fd2e2ee18ce.tar.bz2 | |
prefer moc-qt4, uic-qt4 and qmake-qt4 over moc, uic and qmake
Alex
svn path=/trunk/KDE/kdelibs/; revision=521522
| -rw-r--r-- | modules/FindQt4.cmake | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/modules/FindQt4.cmake b/modules/FindQt4.cmake index 2246907f..8f02f4e1 100644 --- a/modules/FindQt4.cmake +++ b/modules/FindQt4.cmake @@ -503,7 +503,7 @@ IF (QT4_QMAKE_FOUND) # at first without the system paths, in order to prefer e.g. ${QTDIR}/bin/qmake over /usr/bin/qmake, # which might be a Qt3 qmake FIND_PROGRAM(QT_MOC_EXECUTABLE - NAMES moc + NAMES moc-qt4 moc PATHS ${QT_BINARY_DIR} $ENV{QTDIR}/bin @@ -513,7 +513,7 @@ IF (QT4_QMAKE_FOUND) # if qmake wasn't found in the specific dirs, now check the system path IF (NOT QT_MOC_EXECUTABLE) - FIND_PROGRAM(QT_MOC_EXECUTABLE NAMES moc ) + FIND_PROGRAM(QT_MOC_EXECUTABLE NAMES moc-qt4 moc ) ENDIF (NOT QT_MOC_EXECUTABLE) IF (QT_MOC_EXECUTABLE) @@ -529,7 +529,7 @@ IF (QT4_QMAKE_FOUND) # first the specific paths, then the system path, same as with qmake FIND_PROGRAM(QT_UIC_EXECUTABLE - NAMES uic + NAMES uic-qt4 uic PATHS ${QT_BINARY_DIR} $ENV{QTDIR}/bin @@ -538,7 +538,7 @@ IF (QT4_QMAKE_FOUND) ) IF (NOT QT_UIC_EXECUTABLE) - FIND_PROGRAM(QT_UIC_EXECUTABLE NAMES uic ) + FIND_PROGRAM(QT_UIC_EXECUTABLE NAMES uic-qt4 uic ) ENDIF (NOT QT_UIC_EXECUTABLE) IF (QT_UIC_EXECUTABLE) |