diff options
| -rw-r--r-- | Modules/FindQt3.cmake | 14 |
1 files changed, 14 insertions, 0 deletions
diff --git a/Modules/FindQt3.cmake b/Modules/FindQt3.cmake index 93034f0..3fb188d 100644 --- a/Modules/FindQt3.cmake +++ b/Modules/FindQt3.cmake @@ -120,6 +120,14 @@ FIND_LIBRARY(QT_QASSISTANTCLIENT_LIBRARY /usr/X11R6/lib ) +# qt 3 should prefer QTDIR over the PATH +FIND_PROGRAM(QT_MOC_EXECUTABLE + NAMES moc moc-qt3 + PATHS + $ENV{QTDIR}/bin + NO_DEFAULT_PATH +) + FIND_PROGRAM(QT_MOC_EXECUTABLE NAMES moc moc-qt3 PATHS @@ -140,6 +148,12 @@ IF(QT_MOC_EXECUTABLE) ELSE(QT_MOC_EXECUTABLE) ENDIF(QT_MOC_EXECUTABLE) +# qt 3 should prefer QTDIR over the PATH +FIND_PROGRAM(QT_UIC_EXECUTABLE uic + PATHS + $ENV{QTDIR}/bin + NO_DEFAULT_PATH +) FIND_PROGRAM(QT_UIC_EXECUTABLE uic "[HKEY_CURRENT_USER\\Software\\Trolltech\\Qt3Versions\\3.2.1;InstallDir]/include/Qt" "[HKEY_CURRENT_USER\\Software\\Trolltech\\Qt3Versions\\3.2.0;InstallDir]/include/Qt" |