diff options
| author | Bill Hoffman <bill.hoffman@kitware.com> | 2005-09-10 01:51:23 (GMT) |
|---|---|---|
| committer | Bill Hoffman <bill.hoffman@kitware.com> | 2005-09-10 01:51:23 (GMT) |
| commit | afbc9b7b07d8a356a7650f7cc7298c39f7c0accd (patch) | |
| tree | fdab78b99d0f5441e2ea61f6c7ed8c17da70d2b2 /Modules/FindQt4.cmake | |
| parent | b66c08fc40eaf6bc012647b789f08f8b8a1f42bb (diff) | |
| download | CMake-afbc9b7b07d8a356a7650f7cc7298c39f7c0accd.zip CMake-afbc9b7b07d8a356a7650f7cc7298c39f7c0accd.tar.gz CMake-afbc9b7b07d8a356a7650f7cc7298c39f7c0accd.tar.bz2 | |
ENH: clean up the find qt stuff some
Diffstat (limited to 'Modules/FindQt4.cmake')
| -rw-r--r-- | Modules/FindQt4.cmake | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/Modules/FindQt4.cmake b/Modules/FindQt4.cmake index 55001e7..c12ec3b 100644 --- a/Modules/FindQt4.cmake +++ b/Modules/FindQt4.cmake @@ -116,7 +116,10 @@ IF (WIN32) ENDIF(WIN32) # check for qmake -FIND_PROGRAM(QT_QMAKE_EXECUTABLE NAMES qmake PATHS $ENV{QTDIR}/bin) +FIND_PROGRAM(QT_QMAKE_EXECUTABLE NAMES qmake PATHS + $ENV{QTDIR}/bin + "[HKEY_CURRENT_USER\\Software\\Trolltech\\Qt3Versions\\4.0.0;InstallDir]/bin" +) # Set QT_LIBRARY_DIR IF(NOT QT_LIBRARY_DIR) @@ -153,6 +156,7 @@ IF (NOT QT_HEADERS_DIR) ENDIF(QT_QMAKE_EXECUTABLE) ENDIF (NOT QT_HEADERS_DIR) FIND_PATH( QT_QT_INCLUDE_DIR qglobal.h + "[HKEY_CURRENT_USER\\Software\\Trolltech\\Qt3Versions\\4.0.0;InstallDir]/include/Qt" ${QT_HEADERS_DIR}/Qt ${QT_LIBRARY_DIR}/QtCore.framework/Headers $ENV{QTDIR}/include/Qt |