[Cmake-commits] CMake branch, next, updated. v3.0.0-rc1-1046-g6a4ca08

[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  6a4ca083f4547688614ec8b003bcf0ca3f04af9f (commit)
       via  d537ba304353ebdb504d7bf054e06815d04ff19b (commit)
      from  c7ed80a65fe6a6f6ff10044ed927238da0a0a3e2 (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=6a4ca083f4547688614ec8b003bcf0ca3f04af9f
commit 6a4ca083f4547688614ec8b003bcf0ca3f04af9f
Merge: c7ed80a d537ba3
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Fri Mar 14 10:35:31 2014 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Fri Mar 14 10:35:31 2014 -0400

    Merge topic 'fix-Qt5-windows-build' into next
    
    d537ba30 Simplify logic.


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=d537ba304353ebdb504d7bf054e06815d04ff19b
commit d537ba304353ebdb504d7bf054e06815d04ff19b
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Fri Mar 14 15:33:49 2014 +0100
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Fri Mar 14 15:34:30 2014 +0100

    Simplify logic.

diff --git a/Source/QtDialog/CMakeLists.txt b/Source/QtDialog/CMakeLists.txt
index 2abfb99..f5ddc0a 100644
--- a/Source/QtDialog/CMakeLists.txt
+++ b/Source/QtDialog/CMakeLists.txt
@@ -38,7 +38,9 @@ if (Qt5Widgets_FOUND)
     get_filename_component(Qt_BIN_DIR "${_Qt5_Core_LOCATION}" PATH)
   endif()
 
-  set(QT_QTMAIN_LIBRARY Qt5::WinMain)
+  if (NOT POLICY CMP0020)
+    set(QT_QTMAIN_LIBRARY Qt5::WinMain)
+  endif()
 
 else()
   set(QT_MIN_VERSION "4.4.0")
@@ -117,10 +119,7 @@ endif()
 set(CMAKE_INCLUDE_CURRENT_DIR ON)
 
 add_executable(cmake-gui WIN32 MACOSX_BUNDLE ${SRCS})
-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()
+target_link_libraries(cmake-gui CMakeLib ${QT_QTMAIN_LIBRARY} ${CMake_QT_LIBRARIES})
 if(Qt_BIN_DIR)
   set_property(TARGET cmake-gui PROPERTY Qt_BIN_DIR ${Qt_BIN_DIR})
 endif()

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

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


hooks/post-receive
-- 
CMake