[Cmake-commits] CMake branch, next, updated. v3.0.0-rc1-1066-g6577bfd

[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  6577bfdcb9c5088494b6ac0bd64ae5a1b01272d4 (commit)
       via  54eb000635a01cd0a414982fc3af98c6a1591a48 (commit)
      from  b0046054c62ef8e8e22703670d1df3e24d369526 (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=6577bfdcb9c5088494b6ac0bd64ae5a1b01272d4
commit 6577bfdcb9c5088494b6ac0bd64ae5a1b01272d4
Merge: b004605 54eb000
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Sat Mar 15 04:22:41 2014 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Sat Mar 15 04:22:41 2014 -0400

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


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=54eb000635a01cd0a414982fc3af98c6a1591a48
commit 54eb000635a01cd0a414982fc3af98c6a1591a48
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Sat Mar 15 09:20:30 2014 +0100
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Sat Mar 15 09:22:01 2014 +0100

    Simplify logic.

diff --git a/Source/QtDialog/CMakeLists.txt b/Source/QtDialog/CMakeLists.txt
index f5ddc0a..07a50b9 100644
--- a/Source/QtDialog/CMakeLists.txt
+++ b/Source/QtDialog/CMakeLists.txt
@@ -28,6 +28,8 @@ if (Qt5Widgets_FOUND)
     qt5_add_resources(${ARGN})
   endmacro()
   set(CMake_QT_LIBRARIES ${Qt5Widgets_LIBRARIES})
+  set(QT_QTMAIN_LIBRARY Qt5::WinMain)
+
   # Remove this when the minimum version of Qt is 4.6.
   add_definitions(-DQT_DISABLE_DEPRECATED_BEFORE=0)
 
@@ -37,11 +39,6 @@ if (Qt5Widgets_FOUND)
     get_property(_Qt5_Core_LOCATION TARGET Qt5::Core PROPERTY LOCATION)
     get_filename_component(Qt_BIN_DIR "${_Qt5_Core_LOCATION}" PATH)
   endif()
-
-  if (NOT POLICY CMP0020)
-    set(QT_QTMAIN_LIBRARY Qt5::WinMain)
-  endif()
-
 else()
   set(QT_MIN_VERSION "4.4.0")
   find_package(Qt4 REQUIRED)

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

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


hooks/post-receive
-- 
CMake