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 98d9f6e3e107a5c17b03e3003d7ab92ffdc33677 (commit)
via 009c1865dcc967a349be63a713c46ac88d297250 (commit)
from 5e666d80cabcae57555df81df15cd2e70177b865 (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=98d9f6e3e107a5c17b03e3003d7ab92ffdc33677
commit 98d9f6e3e107a5c17b03e3003d7ab92ffdc33677
Merge: 5e666d8 009c186
Author: Brad King <brad.k...@kitware.com>
AuthorDate: Tue Dec 9 10:44:11 2014 -0500
Commit: CMake Topic Stage <kwro...@kitware.com>
CommitDate: Tue Dec 9 10:44:11 2014 -0500
Merge topic 'FindQt4-fix-major-version-mismatch' into next
009c1865 FindQt4: Fix handling of QT_VERSION_MAJOR mismatch
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=009c1865dcc967a349be63a713c46ac88d297250
commit 009c1865dcc967a349be63a713c46ac88d297250
Author: Daniel Scharrer <dan...@constexpr.org>
AuthorDate: Tue Dec 9 15:40:45 2014 +0100
Commit: Brad King <brad.k...@kitware.com>
CommitDate: Tue Dec 9 10:43:02 2014 -0500
FindQt4: Fix handling of QT_VERSION_MAJOR mismatch
Fix capitalization of Qt4_FOUND variable when setting it to false in
this case. This caused find_package(Qt4) to appear successful when it
was not. Note that the legacy QT4_FOUND variable is unconditionally
overwritten at the end of the file with the value of Qt4_FOUND.
diff --git a/Modules/FindQt4.cmake b/Modules/FindQt4.cmake
index a79246a..11091b5 100644
--- a/Modules/FindQt4.cmake
+++ b/Modules/FindQt4.cmake
@@ -1321,7 +1321,7 @@ endif()
if (NOT QT_VERSION_MAJOR EQUAL 4)
set(VERSION_MSG "Found unsuitable Qt version \"${QTVERSION}\" from
${QT_QMAKE_EXECUTABLE}")
- set(QT4_FOUND FALSE)
+ set(Qt4_FOUND FALSE)
if(Qt4_FIND_REQUIRED)
message( FATAL_ERROR "${VERSION_MSG}, this code requires Qt 4.x")
else()
-----------------------------------------------------------------------
Summary of changes:
Modules/FindQt4.cmake | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
hooks/post-receive
--
CMake
_______________________________________________
Cmake-commits mailing list
Cmake-commits@cmake.org
http://public.kitware.com/mailman/listinfo/cmake-commits
