diff options
| author | Alexander Neundorf <neundorf@kde.org> | 2006-01-28 12:55:09 +0000 |
|---|---|---|
| committer | Alexander Neundorf <neundorf@kde.org> | 2006-01-28 12:55:09 +0000 |
| commit | 426fd2a499c367c0262111c1b80bd67c823aee5a (patch) | |
| tree | 60183575646c49f9642bc675a0396ee0cf7234e9 | |
| parent | 6050d6f881b64311764baed1c88d132d5b5f4f4a (diff) | |
| download | extra-cmake-modules-426fd2a499c367c0262111c1b80bd67c823aee5a.tar.gz extra-cmake-modules-426fd2a499c367c0262111c1b80bd67c823aee5a.tar.bz2 | |
-prefer the Qt binaries in the "special" (like QTDIR) directories over the Qt binaries in the normal system paths
Alex
svn path=/trunk/KDE/kdelibs/; revision=503140
| -rw-r--r-- | modules/FindQt4.cmake | 16 |
1 files changed, 16 insertions, 0 deletions
diff --git a/modules/FindQt4.cmake b/modules/FindQt4.cmake index 9e1bc91c..fe9dbff8 100644 --- a/modules/FindQt4.cmake +++ b/modules/FindQt4.cmake @@ -132,8 +132,14 @@ FIND_PROGRAM(QT_QMAKE_EXECUTABLE NAMES qmake PATHS "[HKEY_CURRENT_USER\\Software\\Trolltech\\Versions\\4.0.0;InstallDir]/bin" $ENV{QTDIR}/bin ${QT4_PATHS} + $ENV{PATH} + NO_SYSTEM_PATH ) +IF(NOT QT_QMAKE_EXECUTABLE) + FIND_PROGRAM(QT_QMAKE_EXECUTABLE NAMES qmake) +ENDIF(NOT QT_QMAKE_EXECUTABLE) + IF(QT_QMAKE_EXECUTABLE) EXEC_PROGRAM(${QT_QMAKE_EXECUTABLE} ARGS "-query QT_VERSION" OUTPUT_VARIABLE QTVERSION) @@ -573,8 +579,13 @@ IF(QT4_QMAKE_FOUND) /usr/share/qt4/bin C:/Progra~1/qt/bin /usr/bin/qt4 + NO_SYSTEM_PATH ) + IF(NOT QT_MOC_EXECUTABLE) + FIND_PROGRAM(QT_MOC_EXECUTABLE NAMES moc ) + ENDIF(NOT QT_MOC_EXECUTABLE) + IF(QT_MOC_EXECUTABLE) SET ( QT_WRAP_CPP "YES") ENDIF(QT_MOC_EXECUTABLE) @@ -605,8 +616,13 @@ IF(QT4_QMAKE_FOUND) /usr/share/qt4/bin C:/Progra~1/qt/bin /usr/bin/qt4 + NO_SYSTEM_PATH ) + IF(NOT QT_UIC_EXECUTABLE) + FIND_PROGRAM(QT_UIC_EXECUTABLE NAMES uic ) + ENDIF(NOT QT_UIC_EXECUTABLE) + IF(QT_UIC_EXECUTABLE) SET ( QT_WRAP_UI "YES") ENDIF(QT_UIC_EXECUTABLE) |