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 96d9f18a4ecda60feb212508eb37b289740c10d0 (commit)
via 501b850a0517a0c342bf3241e93ed5761ef8aa8b (commit)
from b2958d4c652e1492d631877b6d28e78d473897c5 (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=96d9f18a4ecda60feb212508eb37b289740c10d0
commit 96d9f18a4ecda60feb212508eb37b289740c10d0
Merge: b2958d4 501b850
Author: Stephen Kelly <steve...@gmail.com>
AuthorDate: Thu Mar 13 09:56:06 2014 -0400
Commit: CMake Topic Stage <kwro...@kitware.com>
CommitDate: Thu Mar 13 09:56:06 2014 -0400
Merge topic 'fix-Qt5-windows-build' into next
501b850a Specify Qt4::QtGui dependency.
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=501b850a0517a0c342bf3241e93ed5761ef8aa8b
commit 501b850a0517a0c342bf3241e93ed5761ef8aa8b
Author: Stephen Kelly <steve...@gmail.com>
AuthorDate: Thu Mar 13 14:55:17 2014 +0100
Commit: Stephen Kelly <steve...@gmail.com>
CommitDate: Thu Mar 13 14:55:17 2014 +0100
Specify Qt4::QtGui dependency.
With CMake 2.8.4, it doesn't know it itself.
diff --git a/Source/QtDialog/CMakeLists.txt b/Source/QtDialog/CMakeLists.txt
index 7ba44fd..608ee08 100644
--- a/Source/QtDialog/CMakeLists.txt
+++ b/Source/QtDialog/CMakeLists.txt
@@ -50,7 +50,7 @@ else()
include(${QT_USE_FILE})
- set(QT_LIBRARIES Qt4::QtGui)
+ set(QT_LIBRARIES Qt4::QtGui Qt4::QtCore)
if(WIN32 AND EXISTS "${QT_QMAKE_EXECUTABLE}")
get_filename_component(_Qt_BIN_DIR "${QT_QMAKE_EXECUTABLE}" PATH)
-----------------------------------------------------------------------
Summary of changes:
Source/QtDialog/CMakeLists.txt | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
hooks/post-receive
--
CMake
_______________________________________________
Cmake-commits mailing list
Cmake-commits@cmake.org
http://public.kitware.com/cgi-bin/mailman/listinfo/cmake-commits
