[cmake-commits] hoffman committed FindQt4.cmake 1.45 1.46

[cmake-commits at cmake.org]

Update of /cvsroot/CMake/CMake/Modules
In directory public:/mounts/ram/cvs-serv31025/Modules

Modified Files:
	FindQt4.cmake 
Log Message:
BUG: fix for bug#3720


Index: FindQt4.cmake
===================================================================
RCS file: /cvsroot/CMake/CMake/Modules/FindQt4.cmake,v
retrieving revision 1.45
retrieving revision 1.46
diff -u -d -r1.45 -r1.46
--- FindQt4.cmake	2 Oct 2006 13:03:17 -0000	1.45
+++ FindQt4.cmake	3 Oct 2006 18:39:05 -0000	1.46
@@ -200,6 +200,15 @@
    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}")