[Cmake-commits] CMake branch, next, updated. v2.8.10.2-2437-g2b116bd
Clinton Stimpson
clinton at elemtech.com
Mon Mar 11 12:43:07 EDT 2013
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 2b116bd80ea50a46640d701e8f55742250a5cba5 (commit)
via b8347ae9647a0e360fefaa98cec92a710c408be1 (commit)
from e29babed482aaf643035197fba251169ca67101f (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=2b116bd80ea50a46640d701e8f55742250a5cba5
commit 2b116bd80ea50a46640d701e8f55742250a5cba5
Merge: e29babe b8347ae
Author: Clinton Stimpson <clinton at elemtech.com>
AuthorDate: Mon Mar 11 12:43:05 2013 -0400
Commit: CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Mon Mar 11 12:43:05 2013 -0400
Merge topic 'findqt4-withqt5' into next
b8347ae Fix bug in 9345df where it wasn't correctly checking termination criteria.
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=b8347ae9647a0e360fefaa98cec92a710c408be1
commit b8347ae9647a0e360fefaa98cec92a710c408be1
Author: Clinton Stimpson <clinton at elemtech.com>
AuthorDate: Mon Mar 11 10:41:53 2013 -0600
Commit: Clinton Stimpson <clinton at elemtech.com>
CommitDate: Mon Mar 11 10:41:53 2013 -0600
Fix bug in 9345df where it wasn't correctly checking termination criteria.
diff --git a/Modules/FindQt4.cmake b/Modules/FindQt4.cmake
index 89cb2fb..590a86e 100644
--- a/Modules/FindQt4.cmake
+++ b/Modules/FindQt4.cmake
@@ -521,7 +521,7 @@ endfunction()
function(_QT4_FIND_QMAKE QMAKE_NAMES QMAKE_RESULT VERSION_RESULT)
list(LENGTH QMAKE_NAMES QMAKE_NAMES_LEN)
- if(${QMAKE_NAMES_LEN} EQUAL })
+ if(${QMAKE_NAMES_LEN} EQUAL 0)
return()
endif()
list(GET QMAKE_NAMES 0 QMAKE_NAME)
-----------------------------------------------------------------------
Summary of changes:
Modules/FindQt4.cmake | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
hooks/post-receive
--
CMake
More information about the Cmake-commits
mailing list