[Cmake-commits] CMake branch, next, updated. v3.0.0-rc1-1012-gf851206

[Stephen Kelly]

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  f851206bae9b9f3ecf8c01e4f52c32ffa896bfe2 (commit)
       via  3e3504f3c90aecc4acd213856541253bc524f8d8 (commit)
      from  47344e2137ab8b5059ed017baf3dbdbcad95a5a0 (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=f851206bae9b9f3ecf8c01e4f52c32ffa896bfe2
commit f851206bae9b9f3ecf8c01e4f52c32ffa896bfe2
Merge: 47344e2 3e3504f
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Fri Mar 14 03:44:28 2014 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Fri Mar 14 03:44:28 2014 -0400

    Merge topic 'fix-Qt5-windows-build' into next
    
    3e3504f3 Linking to the Qt4 IMPORTED libraries is not sufficient.


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=3e3504f3c90aecc4acd213856541253bc524f8d8
commit 3e3504f3c90aecc4acd213856541253bc524f8d8
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Fri Mar 14 08:43:10 2014 +0100
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Fri Mar 14 08:43:10 2014 +0100

    Linking to the Qt4 IMPORTED libraries is not sufficient.
    
    Append to the list to link to instead of replacing it.

diff --git a/Source/QtDialog/CMakeLists.txt b/Source/QtDialog/CMakeLists.txt
index 608ee08..fd7d68a 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 Qt4::QtCore)
+  list(APPEND 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