[Cmake-commits] CMake branch, next, updated. v3.0.0-rc1-1040-g56d6bd9

[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  56d6bd9e0d251f6c268f41647771e457bbc2729c (commit)
       via  aeaef5e7dc34523d85682e21e4ca2c56c8dd298b (commit)
      from  d11bfd80672d2c9bab6d3e18583c0cedccbbd5c4 (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=56d6bd9e0d251f6c268f41647771e457bbc2729c
commit 56d6bd9e0d251f6c268f41647771e457bbc2729c
Merge: d11bfd8 aeaef5e
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Fri Mar 14 09:55:00 2014 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Fri Mar 14 09:55:00 2014 -0400

    Merge topic 'fix-Qt5-windows-build' into next
    
    aeaef5e7 Don't use imported targets with Qt 4.


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

    Don't use imported targets with Qt 4.

diff --git a/Source/QtDialog/CMakeLists.txt b/Source/QtDialog/CMakeLists.txt
index fd7d68a..2abfb99 100644
--- a/Source/QtDialog/CMakeLists.txt
+++ b/Source/QtDialog/CMakeLists.txt
@@ -27,7 +27,7 @@ if (Qt5Widgets_FOUND)
   macro(qt4_add_resources)
     qt5_add_resources(${ARGN})
   endmacro()
-  set(QT_LIBRARIES ${Qt5Widgets_LIBRARIES})
+  set(CMake_QT_LIBRARIES ${Qt5Widgets_LIBRARIES})
   # Remove this when the minimum version of Qt is 4.6.
   add_definitions(-DQT_DISABLE_DEPRECATED_BEFORE=0)
 
@@ -50,7 +50,7 @@ else()
 
   include(${QT_USE_FILE})
 
-  list(APPEND QT_LIBRARIES Qt4::QtGui Qt4::QtCore)
+  set(CMake_QT_LIBRARIES ${QT_LIBRARIES})
 
   if(WIN32 AND EXISTS "${QT_QMAKE_EXECUTABLE}")
     get_filename_component(_Qt_BIN_DIR "${QT_QMAKE_EXECUTABLE}" PATH)
@@ -117,8 +117,8 @@ endif()
 set(CMAKE_INCLUDE_CURRENT_DIR ON)
 
 add_executable(cmake-gui WIN32 MACOSX_BUNDLE ${SRCS})
-target_link_libraries(cmake-gui CMakeLib ${QT_LIBRARIES})
-if (NOT POLICY CMP0020)
+target_link_libraries(cmake-gui CMakeLib ${CMake_QT_LIBRARIES})
+if (NOT Qt5Widgets_FOUND OR NOT POLICY CMP0020)
   target_link_libraries(cmake-gui ${QT_QTMAIN_LIBRARY})
 endif()
 if(Qt_BIN_DIR)

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

Summary of changes:
 Source/QtDialog/CMakeLists.txt |    8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)


hooks/post-receive
-- 
CMake