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

FindQt4: Give precedence to QTDIR environment variable, if set.

This commit is contained in:
Clinton Stimpson 2012-08-15 18:20:16 -06:00
parent 4a772a1686
commit 5a6a3d4342
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Modules/FindQt4.cmake
View File

@ -487,10 +487,10 @@ get_filename_component(qt_install_version "[HKEY_CURRENT_USER\\Software\\trollte
# Debian uses qmake-qt4 # Debian uses qmake-qt4
# macports' Qt uses qmake-mac # macports' Qt uses qmake-mac
find_program(QT_QMAKE_EXECUTABLE NAMES qmake qmake4 qmake-qt4 qmake-mac PATHS find_program(QT_QMAKE_EXECUTABLE NAMES qmake qmake4 qmake-qt4 qmake-mac PATHS
$ENV{QTDIR}/bin
"[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" "[HKEY_CURRENT_USER\\Software\\Trolltech\\Versions\\4.0.0;InstallDir]/bin"
"[HKEY_CURRENT_USER\\Software\\Trolltech\\Versions\\${qt_install_version};InstallDir]/bin" "[HKEY_CURRENT_USER\\Software\\Trolltech\\Versions\\${qt_install_version};InstallDir]/bin"
$ENV{QTDIR}/bin
DOC "The qmake executable for the Qt installation to use" DOC "The qmake executable for the Qt installation to use"
) )