kolan/CMake
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

ENH: add new place to search for qt4 in registry

Browse Source
This commit is contained in:
Bill Hoffman 2005-09-12 11:43:24 -04:00
parent 7a330b9cbc
commit 74918bfc87
2 changed files with 2 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
Modules/FindQt.cmake
View File

@ -62,6 +62,7 @@ ENDIF(QT_QMAKE_EXECUTABLE)
FIND_FILE( QT4_QGLOBAL_H_FILE qglobal.h FIND_FILE( QT4_QGLOBAL_H_FILE qglobal.h
"${QT_SEARCH_PATH}/Qt/include" "${QT_SEARCH_PATH}/Qt/include"
"[HKEY_CURRENT_USER\\Software\\Trolltech\\Qt3Versions\\4.0.0;InstallDir]/include/Qt" "[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 ${qt_headers}/Qt
$ENV{QTDIR}/include/Qt $ENV{QTDIR}/include/Qt
/usr/local/qt/include/Qt /usr/local/qt/include/Qt

1
Modules/FindQt4.cmake
View File

@ -128,6 +128,7 @@ ENDIF(GLOB_TEMP_VAR)
# check for qmake # check for qmake
FIND_PROGRAM(QT_QMAKE_EXECUTABLE NAMES qmake PATHS FIND_PROGRAM(QT_QMAKE_EXECUTABLE NAMES qmake PATHS
"[HKEY_CURRENT_USER\\Software\\Trolltech\\Qt3Versions\\4.0.0;InstallDir]/bin" "[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 $ENV{QTDIR}/bin
${QT4_PATHS} ${QT4_PATHS}
) )