[Cmake-commits] CMake branch, master, updated. v3.13.0-rc3-445-ga786062

[Kitware Robot]

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, master has been updated
       via  a786062db2bbfe375b51c200122eb3227120af2a (commit)
       via  254a84986471d6f3405d9bf1798bc3f9582a81e8 (commit)
       via  b173c641c4efbb5fd3f3f4c18676be81abafb066 (commit)
      from  117272412e9dee1a1595718590a48e4c6750df59 (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 -----------------------------------------------------------------
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=a786062db2bbfe375b51c200122eb3227120af2a
commit a786062db2bbfe375b51c200122eb3227120af2a
Merge: 1172724 254a849
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Wed Nov 14 20:18:09 2018 +0000
Commit:     Kitware Robot <kwrobot at kitware.com>
CommitDate: Wed Nov 14 15:18:15 2018 -0500

    Merge topic 'WIN32'
    
    254a849864 Help: Spell out MFC
    b173c641c4 Help: Add links to variables
    
    Acked-by: Kitware Robot <kwrobot at kitware.com>
    Merge-request: !2613


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=254a84986471d6f3405d9bf1798bc3f9582a81e8
commit 254a84986471d6f3405d9bf1798bc3f9582a81e8
Author:     Joachim Wuttke (o) <j.wuttke at fz-juelich.de>
AuthorDate: Wed Nov 14 17:47:36 2018 +0100
Commit:     Joachim Wuttke (o) <j.wuttke at fz-juelich.de>
CommitDate: Wed Nov 14 17:50:45 2018 +0100

    Help: Spell out MFC
    
    And shorten text that was hard to understand and redundant.

diff --git a/Help/prop_tgt/WIN32_EXECUTABLE.rst b/Help/prop_tgt/WIN32_EXECUTABLE.rst
index ceda621..060d166 100644
--- a/Help/prop_tgt/WIN32_EXECUTABLE.rst
+++ b/Help/prop_tgt/WIN32_EXECUTABLE.rst
@@ -7,6 +7,7 @@ When this property is set to true the executable when linked on
 Windows will be created with a WinMain() entry point instead of just
 main().  This makes it a GUI executable instead of a console application.
 See the :variable:`CMAKE_MFC_FLAG` variable documentation to
-configure use of MFC for WinMain executables.  This property is
-initialized by the value of the :variable:`CMAKE_WIN32_EXECUTABLE`
-variable if it is set when a target is created.
+configure use of the Microsoft Foundation Classes (MFC) for WinMain
+executables.  This property is initialized by the value of the
+:variable:`CMAKE_WIN32_EXECUTABLE` variable if it is set when
+a target is created.
diff --git a/Help/variable/CMAKE_MFC_FLAG.rst b/Help/variable/CMAKE_MFC_FLAG.rst
index 5a392bf..2c4d1c5 100644
--- a/Help/variable/CMAKE_MFC_FLAG.rst
+++ b/Help/variable/CMAKE_MFC_FLAG.rst
@@ -1,15 +1,16 @@
 CMAKE_MFC_FLAG
 --------------
 
-Tell cmake to use MFC for an executable or dll.
+Use the MFC library for an executable or dll.
 
-This can be set in a ``CMakeLists.txt`` file and will enable MFC in the
-application.  It should be set to ``1`` for the static MFC library, and ``2``
-for the shared MFC library.  This is used in Visual Studio
-project files.  The CMakeSetup dialog used MFC and the ``CMakeLists.txt``
-looks like this:
+Enables the use of the Microsoft Foundation Classes (MFC).
+It should be set to ``1`` for the static MFC library, and
+``2`` for the shared MFC library.  This is used in Visual Studio
+project files.
 
-::
+Usage example:
+
+.. code-block:: cmake
 
   add_definitions(-D_AFXDLL)
   set(CMAKE_MFC_FLAG 2)

https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=b173c641c4efbb5fd3f3f4c18676be81abafb066
commit b173c641c4efbb5fd3f3f4c18676be81abafb066
Author:     Joachim Wuttke (o) <j.wuttke at fz-juelich.de>
AuthorDate: Wed Nov 14 17:38:32 2018 +0100
Commit:     Joachim Wuttke (o) <j.wuttke at fz-juelich.de>
CommitDate: Wed Nov 14 17:50:45 2018 +0100

    Help: Add links to variables

diff --git a/Help/prop_tgt/WIN32_EXECUTABLE.rst b/Help/prop_tgt/WIN32_EXECUTABLE.rst
index 336d5f7..ceda621 100644
--- a/Help/prop_tgt/WIN32_EXECUTABLE.rst
+++ b/Help/prop_tgt/WIN32_EXECUTABLE.rst
@@ -5,8 +5,8 @@ Build an executable with a WinMain entry point on windows.
 
 When this property is set to true the executable when linked on
 Windows will be created with a WinMain() entry point instead of just
-main().  This makes it a GUI executable instead of a console
-application.  See the CMAKE_MFC_FLAG variable documentation to
+main().  This makes it a GUI executable instead of a console application.
+See the :variable:`CMAKE_MFC_FLAG` variable documentation to
 configure use of MFC for WinMain executables.  This property is
-initialized by the value of the variable CMAKE_WIN32_EXECUTABLE if it
-is set when a target is created.
+initialized by the value of the :variable:`CMAKE_WIN32_EXECUTABLE`
+variable if it is set when a target is created.

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

Summary of changes:
 Help/prop_tgt/WIN32_EXECUTABLE.rst | 11 ++++++-----
 Help/variable/CMAKE_MFC_FLAG.rst   | 15 ++++++++-------
 2 files changed, 14 insertions(+), 12 deletions(-)


hooks/post-receive
-- 
CMake