mirror of
https://github.com/Kitware/CMake.git
synced 2026-04-24 15:18:26 -05:00
ENH: add new place to search for qt4 in registry
This commit is contained in:
@@ -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
|
||||
|
||||
@@ -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}
|
||||
)
|
||||
|
||||
Reference in New Issue
Block a user