[Cmake-commits] CMake branch, next, updated. v3.0.0-rc1-938-g30c878a

[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  30c878a46f6d34551f2545faf59324e68364e249 (commit)
       via  8e43e0c3ddb85a5d2bd464e04d7a8cd251e2d1cb (commit)
      from  0d2616536a4815b4859ceb7770f8f7cbdaacd2f5 (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=30c878a46f6d34551f2545faf59324e68364e249
commit 30c878a46f6d34551f2545faf59324e68364e249
Merge: 0d26165 8e43e0c
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Thu Mar 13 05:13:22 2014 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Thu Mar 13 05:13:22 2014 -0400

    Merge topic 'fix-Qt5-windows-build' into next
    
    8e43e0c3 Link to IMPORTED targets with Qt 4.


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=8e43e0c3ddb85a5d2bd464e04d7a8cd251e2d1cb
commit 8e43e0c3ddb85a5d2bd464e04d7a8cd251e2d1cb
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Thu Mar 13 10:12:02 2014 +0100
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Thu Mar 13 10:12:02 2014 +0100

    Link to IMPORTED targets with Qt 4.
    
    The IMPORTED targets have the CMP0020 logic encoded into them.

diff --git a/Source/QtDialog/CMakeLists.txt b/Source/QtDialog/CMakeLists.txt
index 31fd5c4..7ba44fd 100644
--- a/Source/QtDialog/CMakeLists.txt
+++ b/Source/QtDialog/CMakeLists.txt
@@ -50,6 +50,8 @@ else()
 
   include(${QT_USE_FILE})
 
+  set(QT_LIBRARIES Qt4::QtGui)
+
   if(WIN32 AND EXISTS "${QT_QMAKE_EXECUTABLE}")
     get_filename_component(_Qt_BIN_DIR "${QT_QMAKE_EXECUTABLE}" PATH)
     if(EXISTS "${_Qt_BIN_DIR}/QtCore4.dll")

-----------------------------------------------------------------------

Summary of changes:
 Source/QtDialog/CMakeLists.txt |    2 ++
 1 file changed, 2 insertions(+)


hooks/post-receive
-- 
CMake