diff options
| author | David Cole <david.cole@kitware.com> | 2012-08-20 19:40:36 (GMT) |
|---|---|---|
| committer | CMake Topic Stage <kwrobot@kitware.com> | 2012-08-20 19:40:36 (GMT) |
| commit | 1239b4881d95a31301c651e2d422a100eeb5743b (patch) | |
| tree | b2a20d631ce6d789571db1a861466d053248e920 /Modules | |
| parent | 321bbed130f3a61b089af2011c1f2467843f7050 (diff) | |
| parent | 35c6ae88779432ec69d328ec2b00b97eebf1bb16 (diff) | |
| download | CMake-1239b4881d95a31301c651e2d422a100eeb5743b.zip CMake-1239b4881d95a31301c651e2d422a100eeb5743b.tar.gz CMake-1239b4881d95a31301c651e2d422a100eeb5743b.tar.bz2 | |
Merge topic 'qt4-path-search'
35c6ae8 FindQt4: Give precedence to QTDIR environment variable, if set.
5a6a3d4 FindQt4: Give precedence to QTDIR environment variable, if set.
Diffstat (limited to 'Modules')
| -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 fac8579..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 - "[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" - $ENV{QTDIR}/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" ) |