diff options
| author | Simon Perreault <nomis80@nomis80.org> | 2006-05-25 19:03:30 +0000 |
|---|---|---|
| committer | Simon Perreault <nomis80@nomis80.org> | 2006-05-25 19:03:30 +0000 |
| commit | 6d56dd479fa8266d183088b8aaf23468389045fd (patch) | |
| tree | 53419aa5b9d66ae808cca9275d6744ba13aeada0 | |
| parent | 820a0a79c092957b4711043ec6c4c3e6362919fd (diff) | |
| download | extra-cmake-modules-6d56dd479fa8266d183088b8aaf23468389045fd.tar.gz extra-cmake-modules-6d56dd479fa8266d183088b8aaf23468389045fd.tar.bz2 | |
Check for qmake-qt4 before qmake. Doing otherwise would fail on Debian because
qmake comes from Qt 3.
svn path=/trunk/KDE/kdelibs/; revision=544680
| -rw-r--r-- | modules/FindQt4.cmake | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/modules/FindQt4.cmake b/modules/FindQt4.cmake index 82260528..d65de15d 100644 --- a/modules/FindQt4.cmake +++ b/modules/FindQt4.cmake @@ -172,7 +172,7 @@ IF (WIN32) ENDIF(WIN32) # check for qmake -FIND_PROGRAM(QT_QMAKE_EXECUTABLE NAMES qmake qmake-qt4 PATHS +FIND_PROGRAM(QT_QMAKE_EXECUTABLE NAMES qmake-qt4 qmake PATHS "[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 @@ -183,6 +183,7 @@ SET(QT4_INSTALLED_VERSION_TOO_OLD FALSE) IF (QT_QMAKE_EXECUTABLE) + MESSAGE( STATUS "Found qmake: ${QT_QMAKE_EXECUTABLE}" ) SET(QT4_QMAKE_FOUND FALSE) EXEC_PROGRAM(${QT_QMAKE_EXECUTABLE} ARGS "-query QT_VERSION" OUTPUT_VARIABLE QTVERSION) |