[Cmake-commits] CMake branch, next, updated. v3.0.0-rc2-1207-g18a9ea5

[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  18a9ea52fc659088d57e9841f4dcace915dd45aa (commit)
       via  5f210672daff7841bd83023e0d72dfb6b2dacc01 (commit)
      from  41c7d6a0e2a6bffcf682926007a53445fb98fa2f (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=18a9ea52fc659088d57e9841f4dcace915dd45aa
commit 18a9ea52fc659088d57e9841f4dcace915dd45aa
Merge: 41c7d6a 5f21067
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Wed Mar 19 10:39:44 2014 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Wed Mar 19 10:39:44 2014 -0400

    Merge topic 'fix-Qt5-non-Windows' into next
    
    5f210672 QtDialog: Fix Qt 5 build on non-Windows.


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=5f210672daff7841bd83023e0d72dfb6b2dacc01
commit 5f210672daff7841bd83023e0d72dfb6b2dacc01
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Wed Mar 19 15:34:18 2014 +0100
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Wed Mar 19 15:38:02 2014 +0100

    QtDialog: Fix Qt 5 build on non-Windows.
    
    The Qt5Core_QTMAIN_LIBRARIES variable is defined to the Qt5::WinMain
    target on Windows, and undefined elsewhere.

diff --git a/Source/QtDialog/CMakeLists.txt b/Source/QtDialog/CMakeLists.txt
index 07a50b9..7885a0c 100644
--- a/Source/QtDialog/CMakeLists.txt
+++ b/Source/QtDialog/CMakeLists.txt
@@ -28,7 +28,7 @@ if (Qt5Widgets_FOUND)
     qt5_add_resources(${ARGN})
   endmacro()
   set(CMake_QT_LIBRARIES ${Qt5Widgets_LIBRARIES})
-  set(QT_QTMAIN_LIBRARY Qt5::WinMain)
+  set(QT_QTMAIN_LIBRARY ${Qt5Core_QTMAIN_LIBRARIES})
 
   # Remove this when the minimum version of Qt is 4.6.
   add_definitions(-DQT_DISABLE_DEPRECATED_BEFORE=0)

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

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


hooks/post-receive
-- 
CMake