diff options
| author | Andy Cedilnik <andy.cedilnik@kitware.com> | 2006-02-28 16:13:44 (GMT) |
|---|---|---|
| committer | Andy Cedilnik <andy.cedilnik@kitware.com> | 2006-02-28 16:13:44 (GMT) |
| commit | 2251970c1d3d8820e47080cb92f923311bb46b7f (patch) | |
| tree | 86c6a74f554a4e5c39085ca679e940d760f810cd | |
| parent | 7603244509ad40a5109476f20542bd43354ceba7 (diff) | |
| download | CMake-2251970c1d3d8820e47080cb92f923311bb46b7f.zip CMake-2251970c1d3d8820e47080cb92f923311bb46b7f.tar.gz CMake-2251970c1d3d8820e47080cb92f923311bb46b7f.tar.bz2 | |
ENH: Add support for debian having both qt3 and qt4
| -rw-r--r-- | Modules/FindQt4.cmake | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Modules/FindQt4.cmake b/Modules/FindQt4.cmake index 6d1ef9b..550f5fd 100644 --- a/Modules/FindQt4.cmake +++ b/Modules/FindQt4.cmake @@ -126,7 +126,7 @@ IF(GLOB_TEMP_VAR) SET(QT4_PATHS ${QT4_PATHS} ${GLOB_TEMP_VAR}) ENDIF(GLOB_TEMP_VAR) # check for qmake -FIND_PROGRAM(QT_QMAKE_EXECUTABLE NAMES qmake PATHS +FIND_PROGRAM(QT_QMAKE_EXECUTABLE NAMES qmake-qt4 qmak PATHS "[HKEY_CURRENT_USER\\Software\\Trolltech\\Qt3Versions\\4.0.0;InstallDir]/bin" "[HKEY_CURRENT_USER\\Software\\Trolltech\\Versions\\4.0.0;InstallDir]/bin" $ENV{QTDIR}/bin |