diff options
| author | Bill Hoffman <bill.hoffman@kitware.com> | 2005-09-12 15:43:24 (GMT) |
|---|---|---|
| committer | Bill Hoffman <bill.hoffman@kitware.com> | 2005-09-12 15:43:24 (GMT) |
| commit | 74918bfc8716dcea71f98da813f05d30ddc476eb (patch) | |
| tree | f28137e7a62ea7054a7250d0b2e81b0476d6491e | |
| parent | 7a330b9cbcdef2bebb0c38b62f33046aea216739 (diff) | |
| download | CMake-74918bfc8716dcea71f98da813f05d30ddc476eb.zip CMake-74918bfc8716dcea71f98da813f05d30ddc476eb.tar.gz CMake-74918bfc8716dcea71f98da813f05d30ddc476eb.tar.bz2 | |
ENH: add new place to search for qt4 in registry
| -rw-r--r-- | Modules/FindQt.cmake | 1 | ||||
| -rw-r--r-- | Modules/FindQt4.cmake | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/Modules/FindQt.cmake b/Modules/FindQt.cmake index 64942f3..41e2776 100644 --- a/Modules/FindQt.cmake +++ b/Modules/FindQt.cmake @@ -62,6 +62,7 @@ ENDIF(QT_QMAKE_EXECUTABLE) FIND_FILE( QT4_QGLOBAL_H_FILE qglobal.h "${QT_SEARCH_PATH}/Qt/include" "[HKEY_CURRENT_USER\\Software\\Trolltech\\Qt3Versions\\4.0.0;InstallDir]/include/Qt" + "[HKEY_CURRENT_USER\\Software\\Trolltech\\Versions\\4.0.0;InstallDir]/include/Qt" ${qt_headers}/Qt $ENV{QTDIR}/include/Qt /usr/local/qt/include/Qt diff --git a/Modules/FindQt4.cmake b/Modules/FindQt4.cmake index 347640a..c44fe2e 100644 --- a/Modules/FindQt4.cmake +++ b/Modules/FindQt4.cmake @@ -128,6 +128,7 @@ ENDIF(GLOB_TEMP_VAR) # check for qmake FIND_PROGRAM(QT_QMAKE_EXECUTABLE NAMES qmake 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 ${QT4_PATHS} ) |