diff options
| author | Clinton Stimpson <clinton@elemtech.com> | 2012-08-16 13:31:17 (GMT) |
|---|---|---|
| committer | Clinton Stimpson <clinton@elemtech.com> | 2012-08-16 13:31:17 (GMT) |
| commit | 35c6ae88779432ec69d328ec2b00b97eebf1bb16 (patch) | |
| tree | e14fc854142a670609c26efb74de35751a35d87a /Modules/FindQt4.cmake | |
| parent | 5a6a3d4342f835b2d7adf8f1679a2b70bc3897ef (diff) | |
| download | CMake-35c6ae88779432ec69d328ec2b00b97eebf1bb16.zip CMake-35c6ae88779432ec69d328ec2b00b97eebf1bb16.tar.gz CMake-35c6ae88779432ec69d328ec2b00b97eebf1bb16.tar.bz2 | |
FindQt4: Give precedence to QTDIR environment variable, if set.
Remove old search paths that aren't needed.
Keep using PATHS instead of HINTS because a Windows machine may have
a different Qt in its PATH and putting QTDIR and the registry entry
ahead of PATH could cause apps to fail when run.
Diffstat (limited to 'Modules/FindQt4.cmake')
| -rw-r--r-- | Modules/FindQt4.cmake | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/Modules/FindQt4.cmake b/Modules/FindQt4.cmake index 726d86c..6886d93 100644 --- a/Modules/FindQt4.cmake +++ b/Modules/FindQt4.cmake @@ -486,11 +486,11 @@ get_filename_component(qt_install_version "[HKEY_CURRENT_USER\\Software\\trollte # check for qmake # Debian uses qmake-qt4 # macports' Qt uses qmake-mac -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\\Versions\\4.0.0;InstallDir]/bin" - "[HKEY_CURRENT_USER\\Software\\Trolltech\\Versions\\${qt_install_version};InstallDir]/bin" +find_program(QT_QMAKE_EXECUTABLE NAMES qmake qmake4 qmake-qt4 qmake-mac + PATHS + ENV QTDIR + "[HKEY_CURRENT_USER\\Software\\Trolltech\\Versions\\${qt_install_version};InstallDir]" + PATH_SUFFIXES bin DOC "The qmake executable for the Qt installation to use" ) |