diff options
| author | Alexander Neundorf <neundorf@kde.org> | 2009-11-12 17:55:19 (GMT) |
|---|---|---|
| committer | Alexander Neundorf <neundorf@kde.org> | 2009-11-12 17:55:19 (GMT) |
| commit | fb8d583054b3119ff204cc631a27d955b421533a (patch) | |
| tree | f1d216307bb79f5337b9a376f9cd36ba42ee55b5 | |
| parent | 3e5d2bda4db7d6b312ed35b4ed7ac97ccf64c590 (diff) | |
| download | CMake-fb8d583054b3119ff204cc631a27d955b421533a.zip CMake-fb8d583054b3119ff204cc631a27d955b421533a.tar.gz CMake-fb8d583054b3119ff204cc631a27d955b421533a.tar.bz2 | |
also search for "qmake-mac", which is installed by macports (http://lists.kde.org/?l=kde-core-devel&m=125797773120427&w=2)
Alex
| -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 411e390..3d3e2ac 100644 --- a/Modules/FindQt4.cmake +++ b/Modules/FindQt4.cmake @@ -367,7 +367,9 @@ ENDMACRO(QT_QUERY_QMAKE) GET_FILENAME_COMPONENT(qt_install_version "[HKEY_CURRENT_USER\\Software\\trolltech\\Versions;DefaultQtVersion]" NAME) # check for qmake -FIND_PROGRAM(QT_QMAKE_EXECUTABLE NAMES qmake qmake4 qmake-qt4 PATHS +# 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" |