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 9b3a50e84954641bbe1afc084d2169f5bb2457ed (commit)
via 6b9bc54566544e0b1e4687d88d51424cb335114b (commit)
from b831e88b5acbf9749980a02157e1c726884c5479 (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=9b3a50e84954641bbe1afc084d2169f5bb2457ed
commit 9b3a50e84954641bbe1afc084d2169f5bb2457ed
Merge: b831e88 6b9bc54
Author: Clinton Stimpson <clin...@elemtech.com>
AuthorDate: Wed Feb 23 19:14:50 2011 -0500
Commit: CMake Topic Stage <kwro...@kitware.com>
CommitDate: Wed Feb 23 19:14:50 2011 -0500
Merge topic 'qt4-setversion-regression-43cb9b8' into next
6b9bc54 Fix regression in 43cb9b8.
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=6b9bc54566544e0b1e4687d88d51424cb335114b
commit 6b9bc54566544e0b1e4687d88d51424cb335114b
Author: Clinton Stimpson <clin...@elemtech.com>
AuthorDate: Wed Feb 23 17:13:49 2011 -0700
Commit: Clinton Stimpson <clin...@elemtech.com>
CommitDate: Wed Feb 23 17:13:49 2011 -0700
Fix regression in 43cb9b8.
Put back some code for setting the QT_VERSION_* variables that wasn't
supposed to be removed.
diff --git a/Modules/FindQt4.cmake b/Modules/FindQt4.cmake
index 2c3ba6e..b2a89f7 100644
--- a/Modules/FindQt4.cmake
+++ b/Modules/FindQt4.cmake
@@ -1119,6 +1119,11 @@ IF (QT_QMAKE_EXECUTABLE AND QTVERSION)
INCLUDE("${_qt4_current_dir}/Qt4Macros.cmake")
+ # 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_PATCH
"${QTVERSION}")
+
ENDIF(QT_QMAKE_EXECUTABLE AND QTVERSION)
#support old QT_MIN_VERSION if set, but not if version is supplied by
find_package()
-----------------------------------------------------------------------
Summary of changes:
Modules/FindQt4.cmake | 5 +++++
1 files changed, 5 insertions(+), 0 deletions(-)
hooks/post-receive
--
CMake
_______________________________________________
Cmake-commits mailing list
Cmake-commits@cmake.org
http://public.kitware.com/cgi-bin/mailman/listinfo/cmake-commits
