[Cmake-commits] CMake branch, next, updated. v2.8.2-1076-ga3a0bf4
Clinton Stimpson
clinton at elemtech.com
Fri Oct 15 18:37:29 EDT 2010
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "CMake".
The branch, next has been updated
via a3a0bf48c99dcb748eac825011feb6bcea361620 (commit)
via cfba5ef111bf86e8820a4dff556b3a9edc1484cd (commit)
from 41e914bb7361077dadcd03e490eb833f48e07b78 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=a3a0bf48c99dcb748eac825011feb6bcea361620
commit a3a0bf48c99dcb748eac825011feb6bcea361620
Merge: 41e914b cfba5ef
Author: Clinton Stimpson <clinton at elemtech.com>
AuthorDate: Fri Oct 15 16:37:40 2010 -0600
Commit: Clinton Stimpson <clinton at elemtech.com>
CommitDate: Fri Oct 15 16:37:40 2010 -0600
Merge branch 'qt4-imports-dir' into next
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=cfba5ef111bf86e8820a4dff556b3a9edc1484cd
commit cfba5ef111bf86e8820a4dff556b3a9edc1484cd
Author: Clinton Stimpson <clinton at elemtech.com>
AuthorDate: Fri Oct 15 16:36:14 2010 -0600
Commit: Clinton Stimpson <clinton at elemtech.com>
CommitDate: Fri Oct 15 16:36:14 2010 -0600
Fix regression in 2dae2f1 which added find of Qt imports dir.
diff --git a/Modules/FindQt4.cmake b/Modules/FindQt4.cmake
index 45bbd2e..6129329 100644
--- a/Modules/FindQt4.cmake
+++ b/Modules/FindQt4.cmake
@@ -482,7 +482,7 @@ IF (QT_QMAKE_EXECUTABLE)
_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"
@@ -493,7 +493,7 @@ IF (QT_QMAKE_EXECUTABLE)
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}")
-----------------------------------------------------------------------
Summary of changes:
Modules/FindQt4.cmake | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
hooks/post-receive
--
CMake
More information about the Cmake-commits
mailing list