[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    KDE/kdelibs/cmake/modules
From:       Simon Perreault <nomis80 () nomis80 ! org>
Date:       2006-05-25 19:03:34
Message-ID: 1148583814.938385.31360.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 544680 by perreaul:

Check for qmake-qt4 before qmake. Doing otherwise would fail on Debian because
qmake comes from Qt 3.


 M  +2 -1      FindQt4.cmake  


--- trunk/KDE/kdelibs/cmake/modules/FindQt4.cmake #544679:544680
@@ -172,7 +172,7 @@
 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 @@
 
 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)
[prev in list] [next in list] [prev in thread] [next in thread]