diff options
| author | Clinton Stimpson <clinton@elemtech.com> | 2012-08-16 00:20:16 (GMT) |
|---|---|---|
| committer | Clinton Stimpson <clinton@elemtech.com> | 2012-08-16 00:20:16 (GMT) |
| commit | 5a6a3d4342f835b2d7adf8f1679a2b70bc3897ef (patch) | |
| tree | 1c4b410eac06e8265fc670a2dbf874677850f63c | |
| parent | 4a772a16865be1c1dc2937fc3963c7a67f5316f2 (diff) | |
| download | CMake-5a6a3d4342f835b2d7adf8f1679a2b70bc3897ef.zip CMake-5a6a3d4342f835b2d7adf8f1679a2b70bc3897ef.tar.gz CMake-5a6a3d4342f835b2d7adf8f1679a2b70bc3897ef.tar.bz2 | |
FindQt4: Give precedence to QTDIR environment variable, if set.
| -rw-r--r-- | Modules/FindQt4.cmake | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Modules/FindQt4.cmake b/Modules/FindQt4.cmake index fac8579..726d86c 100644 --- a/Modules/FindQt4.cmake +++ b/Modules/FindQt4.cmake @@ -487,10 +487,10 @@ get_filename_component(qt_install_version "[HKEY_CURRENT_USER\\Software\\trollte # 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" - $ENV{QTDIR}/bin DOC "The qmake executable for the Qt installation to use" ) |