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 7e9d998fe3afad833d1e32d3c0c3a1bc47f086f9 (commit)
via 4b9ec00d0e175ec4cc7e1fbe6ed7d1dcbcfb25ba (commit)
from 427d2bdab9dec5861ffbaecf94266c4374681939 (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=7e9d998fe3afad833d1e32d3c0c3a1bc47f086f9
commit 7e9d998fe3afad833d1e32d3c0c3a1bc47f086f9
Merge: 427d2bd 4b9ec00
Author: Clinton Stimpson <clin...@elemtech.com>
AuthorDate: Mon Jan 7 14:06:27 2013 -0500
Commit: CMake Topic Stage <kwro...@kitware.com>
CommitDate: Mon Jan 7 14:06:27 2013 -0500
Merge topic 'qt4-version-openssl' into next
4b9ec00 FindQt4: set QT_VERSION_* variables sooner.
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=4b9ec00d0e175ec4cc7e1fbe6ed7d1dcbcfb25ba
commit 4b9ec00d0e175ec4cc7e1fbe6ed7d1dcbcfb25ba
Author: Clinton Stimpson <clin...@elemtech.com>
AuthorDate: Mon Jan 7 11:06:35 2013 -0700
Commit: Clinton Stimpson <clin...@elemtech.com>
CommitDate: Mon Jan 7 11:06:35 2013 -0700
FindQt4: set QT_VERSION_* variables sooner.
Set QT_VERSION_* variables sooner so they can be set before
Qt4ConfigDependentSettings.cmake uses them.
diff --git a/Modules/FindQt4.cmake b/Modules/FindQt4.cmake
index ea4d8f4..84196cc 100644
--- a/Modules/FindQt4.cmake
+++ b/Modules/FindQt4.cmake
@@ -538,6 +538,11 @@ endif ()
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_PATCH
"${QTVERSION}")
+
# ask qmake for the mkspecs directory
# we do this first because QT_LIBINFIX might be set
if (NOT QT_MKSPECS_DIR OR QT_QMAKE_CHANGED)
@@ -1174,11 +1179,6 @@ 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()
#support old QT_MIN_VERSION if set, but not if version is supplied by
find_package()
-----------------------------------------------------------------------
Summary of changes:
Modules/FindQt4.cmake | 10 +++++-----
1 files changed, 5 insertions(+), 5 deletions(-)
hooks/post-receive
--
CMake
_______________________________________________
Cmake-commits mailing list
Cmake-commits@cmake.org
http://public.kitware.com/cgi-bin/mailman/listinfo/cmake-commits
