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

List:       kde-commits
Subject:    KDE/kdelibs/cmake/modules
From:       Kevin Kofler <kevin.kofler () chello ! at>
Date:       2010-12-10 17:21:14
Message-ID: 20101210172114.676AEAC8A6 () svn ! kde ! org
[Download RAW message or body]

SVN commit 1205274 by kkofler:

FindQt4.cmake: Merge cfba5ef1 from upstream CMake:
http://cmake.org/gitweb?p=cmake.git;a=commit;h=cfba5ef111bf86e8820a4dff556b3a9edc1484cd
 Fix regression in 2dae2f1 which added find of Qt imports dir.

2dae2f1 was previously merged by mart. This breaks finding qmake-qt4 when there's \
also a Qt 3 qmake around, the Qt 3 qmake is no longer recognized as bad. The above \
fix from upstream CMake fixes that.

CCMAIL: mart@kde.org
CCMAIL: neundorf@kde.org
CCMAIL: rdieter@math.unl.edu

 M  +2 -2      FindQt4.cmake  


--- trunk/KDE/kdelibs/cmake/modules/FindQt4.cmake #1205273:1205274
@@ -467,7 +467,7 @@
   _qt4_query_qmake(QT_VERSION QTVERSION)
 
   # check for qt3 qmake and then try and find qmake4 or qmake-qt4 in the path
-  IF("${QTVERSION}" MATCHES "Unknown")
+  IF(NOT QTVERSION)
     SET(QT_QMAKE_EXECUTABLE NOTFOUND CACHE FILEPATH "" FORCE)
     FIND_PROGRAM(QT_QMAKE_EXECUTABLE NAMES qmake4 qmake-qt4 PATHS
       "[HKEY_CURRENT_USER\\Software\\Trolltech\\Qt3Versions\\4.0.0;InstallDir]/bin"
@@ -478,7 +478,7 @@
     IF(QT_QMAKE_EXECUTABLE)
       _qt4_query_qmake(QT_VERSION QTVERSION)
     ENDIF(QT_QMAKE_EXECUTABLE)
-  ENDIF("${QTVERSION}" MATCHES "Unknown")
+  ENDIF(NOT QTVERSION)
 
   # check that we found the Qt4 qmake, Qt3 qmake output won't match here
   STRING(REGEX MATCH "^[0-9]+\\.[0-9]+\\.[0-9]+" qt_version_tmp "${QTVERSION}")


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