[Cmake-commits] CMake branch, next, updated. v2.8.7-2527-ge36cce1
Clinton Stimpson
clinton at elemtech.com
Wed Feb 8 20:42:23 EST 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 e36cce123f4e5449fe6f8bfa22d5f3881d94e533 (commit)
via cbdfcc6515a58731308d21bb3c5cbaa513503c01 (commit)
from f2b7a4781f9f3fcda3647eafd43b8b967a118b6a (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=e36cce123f4e5449fe6f8bfa22d5f3881d94e533
commit e36cce123f4e5449fe6f8bfa22d5f3881d94e533
Merge: f2b7a47 cbdfcc6
Author: Clinton Stimpson <clinton at elemtech.com>
AuthorDate: Wed Feb 8 20:42:18 2012 -0500
Commit: CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Wed Feb 8 20:42:18 2012 -0500
Merge topic 'qt4-warning-clarification' into next
cbdfcc6 FindQt4: clarify warning message about incorrect Qt installation.
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=cbdfcc6515a58731308d21bb3c5cbaa513503c01
commit cbdfcc6515a58731308d21bb3c5cbaa513503c01
Author: Clinton Stimpson <clinton at elemtech.com>
AuthorDate: Wed Feb 8 18:40:55 2012 -0700
Commit: Clinton Stimpson <clinton at elemtech.com>
CommitDate: Wed Feb 8 18:40:55 2012 -0700
FindQt4: clarify warning message about incorrect Qt installation.
Fixes bug #12915.
Thanks Laurent Rineau and Brad King for input.
diff --git a/Modules/FindQt4.cmake b/Modules/FindQt4.cmake
index c56827e..9b646b4 100644
--- a/Modules/FindQt4.cmake
+++ b/Modules/FindQt4.cmake
@@ -588,8 +588,9 @@ IF (QT_QMAKE_EXECUTABLE AND QTVERSION)
SET(QT_LIBRARY_DIR ${QT_LIBRARY_DIR_TMP} CACHE INTERNAL "Qt library dir" FORCE)
SET(QT_QTCORE_FOUND 1)
ELSE()
- MESSAGE("Warning: QT_QMAKE_EXECUTABLE reported QT_INSTALL_LIBS as ${QT_LIBRARY_DIR_TMP}")
- MESSAGE("Warning: But QtCore couldn't be found. Qt must NOT be installed correctly, or it wasn't found for cross compiling.")
+ MESSAGE(WARNING "${QT_QMAKE_EXECUTABLE} reported QT_INSTALL_LIBS as \"${QT_LIBRARY_DIR_TMP}\" "
+ "but QtCore could not be found there. "
+ "Qt is NOT installed correctly for the target build environment.")
IF(Qt4_FIND_REQUIRED)
MESSAGE( FATAL_ERROR "Could NOT find QtCore. Check ${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/CMakeError.log for more details.")
ENDIF(Qt4_FIND_REQUIRED)
-----------------------------------------------------------------------
Summary of changes:
Modules/FindQt4.cmake | 5 +++--
1 files changed, 3 insertions(+), 2 deletions(-)
hooks/post-receive
--
CMake
More information about the Cmake-commits
mailing list