[Cmake-commits] CMake branch, next, updated. v2.8.9-96-geccdbc8

[Clinton Stimpson]

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  eccdbc8b8da8a3d45f519858ca0639cffbd40ffb (commit)
       via  4a772a16865be1c1dc2937fc3963c7a67f5316f2 (commit)
      from  65034b049f9210dd9ec29742e768c37bb84d879f (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=eccdbc8b8da8a3d45f519858ca0639cffbd40ffb
commit eccdbc8b8da8a3d45f519858ca0639cffbd40ffb
Merge: 65034b0 4a772a1
Author:     Clinton Stimpson <clinton at elemtech.com>
AuthorDate: Wed Aug 15 20:18:43 2012 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Wed Aug 15 20:18:43 2012 -0400

    Merge topic 'qt4-version-regex' into next
    
    4a772a1 Fix regex for qt minor version.


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=4a772a16865be1c1dc2937fc3963c7a67f5316f2
commit 4a772a16865be1c1dc2937fc3963c7a67f5316f2
Author:     Clinton Stimpson <clinton at elemtech.com>
AuthorDate: Wed Aug 15 18:14:40 2012 -0600
Commit:     Clinton Stimpson <clinton at elemtech.com>
CommitDate: Wed Aug 15 18:14:40 2012 -0600

    Fix regex for qt minor version.
    
    Thanks to Dubrovskiy Viacheslav and Sergei Epifanov for patch.

diff --git a/Modules/FindQt4.cmake b/Modules/FindQt4.cmake
index e7d25c9..fac8579 100644
--- a/Modules/FindQt4.cmake
+++ b/Modules/FindQt4.cmake
@@ -1149,7 +1149,7 @@ if (QT_QMAKE_EXECUTABLE AND QTVERSION)
 
   # set version variables
   string(REGEX REPLACE "^([0-9]+)\\.[0-9]+\\.[0-9]+.*" "\\1" QT_VERSION_MAJOR "${QTVERSION}")
-  string(REGEX REPLACE "^[0-9]+\\.([0-9])+\\.[0-9]+.*" "\\1" QT_VERSION_MINOR "${QTVERSION}")
+  string(REGEX REPLACE "^[0-9]+\\.([0-9]+)\\.[0-9]+.*" "\\1" QT_VERSION_MINOR "${QTVERSION}")
   string(REGEX REPLACE "^[0-9]+\\.[0-9]+\\.([0-9]+).*" "\\1" QT_VERSION_PATCH "${QTVERSION}")
 
 endif()

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

Summary of changes:
 Modules/FindQt4.cmake |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)


hooks/post-receive
-- 
CMake