[Cmake-commits] CMake branch, next, updated. v2.8.12.2-7455-gbdbcbc2

[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  bdbcbc240c697eb7a5b02f6e6ae54c24d53821b8 (commit)
       via  0f5dfd10ba430fc9377654ca8cf3f636901aa223 (commit)
      from  a31f1a20e4b50c1ba741e4875b9eb331553834de (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=bdbcbc240c697eb7a5b02f6e6ae54c24d53821b8
commit bdbcbc240c697eb7a5b02f6e6ae54c24d53821b8
Merge: a31f1a2 0f5dfd1
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Wed Feb 5 10:06:26 2014 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Wed Feb 5 10:06:26 2014 -0500

    Merge topic 'Qt4-WIN32-doc' into next
    
    0f5dfd10 Help: Specify that qtmain.lib is only used for WIN32 executables.


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=0f5dfd10ba430fc9377654ca8cf3f636901aa223
commit 0f5dfd10ba430fc9377654ca8cf3f636901aa223
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Thu Jan 30 17:29:50 2014 +0100
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Wed Feb 5 16:05:16 2014 +0100

    Help: Specify that qtmain.lib is only used for WIN32 executables.

diff --git a/Modules/FindQt4.cmake b/Modules/FindQt4.cmake
index 9ea77d4..e188c62 100644
--- a/Modules/FindQt4.cmake
+++ b/Modules/FindQt4.cmake
@@ -23,7 +23,8 @@
 # .. note::
 #
 #  When using :prop_tgt:`IMPORTED` targets, the qtmain.lib static library is
-#  automatically linked on Windows. To disable that globally, set the
+#  automatically linked on Windows for :variable:`WIN32 <WIN32_EXECUTABLE>`
+#  executables. To disable that globally, set the
 #  ``QT4_NO_LINK_QTMAIN`` variable before finding Qt4. To disable that
 #  for a particular executable, set the ``QT4_NO_LINK_QTMAIN`` target
 #  property to ``TRUE`` on the executable.

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

Summary of changes:
 Modules/FindQt4.cmake |    3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)


hooks/post-receive
-- 
CMake