diff options
| author | Clinton Stimpson <clinton@elemtech.com> | 2010-03-17 13:43:22 (GMT) |
|---|---|---|
| committer | Clinton Stimpson <clinton@elemtech.com> | 2010-03-17 13:43:22 (GMT) |
| commit | bd0b37ea3d5733d087b1498a20e2b87d7f537a9f (patch) | |
| tree | 978a9e51c342c192002dc67aaf56cfa222fb5aa9 /Modules | |
| parent | 5e1a2408fedd379467693b3548d46dad464f72ad (diff) | |
| download | CMake-bd0b37ea3d5733d087b1498a20e2b87d7f537a9f.zip CMake-bd0b37ea3d5733d087b1498a20e2b87d7f537a9f.tar.gz CMake-bd0b37ea3d5733d087b1498a20e2b87d7f537a9f.tar.bz2 | |
ENH: Clarify a doc string. Fixes #10358.
Diffstat (limited to 'Modules')
| -rw-r--r-- | Modules/FindQt4.cmake | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/Modules/FindQt4.cmake b/Modules/FindQt4.cmake index 76d7950..515121b 100644 --- a/Modules/FindQt4.cmake +++ b/Modules/FindQt4.cmake @@ -392,11 +392,12 @@ 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 +FIND_PROGRAM(QT_QMAKE_EXECUTABLE NAMES qmake4 qmake-qt4 qmake-mac qmake 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 + DOC "The qmake executable for the Qt installation to use" ) IF (QT_QMAKE_EXECUTABLE) @@ -418,6 +419,7 @@ IF (QT_QMAKE_EXECUTABLE) "[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 + DOC "The qmake executable for the Qt installation to use" ) IF(QT_QMAKE_EXECUTABLE) EXEC_PROGRAM(${QT_QMAKE_EXECUTABLE} |