[Cmake-commits] CMake branch, next, updated. v2.8.8-2805-ga7f8809

Stephen Kelly steveire at gmail.com
Thu May 3 11:42:03 EDT 2012


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  a7f8809d06d8004a708174adffa44a3af82afa23 (commit)
       via  37a28ffa364b397082aa07cf69b32cf8980e1447 (commit)
      from  f87827d87a43380d2ea1684278f94e8bf54e7a39 (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=a7f8809d06d8004a708174adffa44a3af82afa23
commit a7f8809d06d8004a708174adffa44a3af82afa23
Merge: f87827d 37a28ff
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Thu May 3 11:42:02 2012 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Thu May 3 11:42:02 2012 -0400

    Merge topic 'abort-findqt4-on-qt5' into next
    
    37a28ff Fix the number variable comparison when Qt is not found.


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=37a28ffa364b397082aa07cf69b32cf8980e1447
commit 37a28ffa364b397082aa07cf69b32cf8980e1447
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Thu May 3 17:40:04 2012 +0200
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Thu May 3 17:40:04 2012 +0200

    Fix the number variable comparison when Qt is not found.

diff --git a/Modules/FindQt4.cmake b/Modules/FindQt4.cmake
index e7cd02f..f9db5e1 100644
--- a/Modules/FindQt4.cmake
+++ b/Modules/FindQt4.cmake
@@ -1169,7 +1169,7 @@ ELSE( Qt4_FIND_COMPONENTS )
 
 ENDIF( Qt4_FIND_COMPONENTS )
 
-if (${QT_VERSION_MAJOR} GREATER 4)
+if (QT_VERSION_MAJOR GREATER 4)
     SET(VERSION_MSG "Found unsuitable Qt version \"${QTVERSION}\" from ${QT_QMAKE_EXECUTABLE}")
     SET(QT4_FOUND FALSE)
     IF(Qt4_FIND_REQUIRED)

-----------------------------------------------------------------------

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