summaryrefslogtreecommitdiffstats
path: root/Modules/FindQt4.cmake
diff options
context:
space:
mode:
authorBill Hoffman <bill.hoffman@kitware.com>2006-10-03 18:39:05 (GMT)
committerBill Hoffman <bill.hoffman@kitware.com>2006-10-03 18:39:05 (GMT)
commit26d31fc2a08ec2f3b521a3cb253b6209c5dee912 (patch)
tree44c6c55cf0797b74e2662bdae99c381df02b9eaf /Modules/FindQt4.cmake
parent5f01d47d7d1e9a7d6a4dc5d4b4f65294c74245e1 (diff)
downloadCMake-26d31fc2a08ec2f3b521a3cb253b6209c5dee912.zip
CMake-26d31fc2a08ec2f3b521a3cb253b6209c5dee912.tar.gz
CMake-26d31fc2a08ec2f3b521a3cb253b6209c5dee912.tar.bz2
BUG: fix for bug#3720
Diffstat (limited to 'Modules/FindQt4.cmake')
-rw-r--r--Modules/FindQt4.cmake9
1 files changed, 9 insertions, 0 deletions
diff --git a/Modules/FindQt4.cmake b/Modules/FindQt4.cmake
index 6ac94c3..57853ef 100644
--- a/Modules/FindQt4.cmake
+++ b/Modules/FindQt4.cmake
@@ -200,6 +200,15 @@ IF (QT_QMAKE_EXECUTABLE)
SET(QT4_QMAKE_FOUND FALSE)
EXEC_PROGRAM(${QT_QMAKE_EXECUTABLE} ARGS "-query QT_VERSION" OUTPUT_VARIABLE QTVERSION)
+ # check for qt3 qmake and then try and find qmake-qt4 in the path
+ IF("${QTVERSION}" MATCHES "Unknown")
+ SET(QT_QMAKE_EXECUTABLE NOTFOUND)
+ FIND_PROGRAM(QT_QMAKE_EXECUTABLE NAMES qmake-qt4 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
+ )
+ ENDIF("${QTVERSION}" MATCHES "Unknown")
# check that we found the Qt4 qmake, Qt3 qmake output won't match here
STRING(REGEX MATCH "^[0-9]+\\.[0-9]+\\.[0-9]+" qt_version_tmp "${QTVERSION}")