kolan
/
CMake
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

ENH: Add support for debian having both qt3 and qt4

This commit is contained in:
Andy Cedilnik 2006-02-28 11:13:44 -05:00
parent 7603244509
commit 2251970c1d
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Modules/FindQt4.cmake
View File

@ -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