diff options
| author | Alexander Neundorf <neundorf@kde.org> | 2009-11-12 17:56:28 +0000 |
|---|---|---|
| committer | Alexander Neundorf <neundorf@kde.org> | 2009-11-12 17:56:28 +0000 |
| commit | 784fe8d3eb8d105f16f02cb44d6d122f8e5542f8 (patch) | |
| tree | 95fa54ed9e7c0b93e1cbc6573a197508894ebc1f | |
| parent | 908cc003b04239709159ce311f060d4978c9dc09 (diff) | |
| download | extra-cmake-modules-784fe8d3eb8d105f16f02cb44d6d122f8e5542f8.tar.gz extra-cmake-modules-784fe8d3eb8d105f16f02cb44d6d122f8e5542f8.tar.bz2 | |
-also search for qmake-mac, which is used as name for qmake by macports (http://lists.kde.org/?l=kde-core-devel&m=125797773120427&w=2)
Alex
svn path=/trunk/KDE/kdelibs/; revision=1048069
| -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 9318448e..47591692 100644 --- a/modules/FindQt4.cmake +++ b/modules/FindQt4.cmake @@ -414,7 +414,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" |