[Cmake-commits] CMake branch, next, updated. v3.2.1-1441-ga9dac6a

[Brad King]

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  a9dac6a3003102b33da94545a7469cf52b6c726e (commit)
       via  6ed6ef6237fedc0c187163d8b6c26fb0c9ca43c7 (commit)
      from  4b0e1f93a52b005d332537bf0ae9062022a27a1f (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=a9dac6a3003102b33da94545a7469cf52b6c726e
commit a9dac6a3003102b33da94545a7469cf52b6c726e
Merge: 4b0e1f9 6ed6ef6
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Fri Apr 3 11:10:55 2015 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Fri Apr 3 11:10:55 2015 -0400

    Merge topic 'doc-generator-groups' into next
    
    6ed6ef62 Help: Split cmake-generators(7) into linkable subsections


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=6ed6ef6237fedc0c187163d8b6c26fb0c9ca43c7
commit 6ed6ef6237fedc0c187163d8b6c26fb0c9ca43c7
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Fri Apr 3 11:04:57 2015 -0400
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Fri Apr 3 11:04:57 2015 -0400

    Help: Split cmake-generators(7) into linkable subsections
    
    Many places in our documentation refer to "Makefile Generators" or
    "Visual Studio" generators as a group of generators.  Give such
    places a linkable document section to reference since they cannot
    cross-reference the individual generators in the groups.

diff --git a/Help/manual/cmake-generators.7.rst b/Help/manual/cmake-generators.7.rst
index 804229b..6f76fb1 100644
--- a/Help/manual/cmake-generators.7.rst
+++ b/Help/manual/cmake-generators.7.rst
@@ -34,6 +34,11 @@ These generators support command-line build tools.  In order to use them,
 one must launch CMake from a command-line prompt whose environment is
 already configured for the chosen compiler and build tool.
 
+.. _`Makefile Generators`:
+
+Makefile Generators
+^^^^^^^^^^^^^^^^^^^
+
 .. toctree::
    :maxdepth: 1
 
@@ -42,10 +47,17 @@ already configured for the chosen compiler and build tool.
    /generator/MinGW Makefiles
    /generator/NMake Makefiles
    /generator/NMake Makefiles JOM
-   /generator/Ninja
    /generator/Unix Makefiles
    /generator/Watcom WMake
 
+Ninja Generator
+^^^^^^^^^^^^^^^
+
+.. toctree::
+   :maxdepth: 1
+
+   /generator/Ninja
+
 IDE Build Tool Generators
 -------------------------
 
@@ -53,6 +65,11 @@ These generators support Integrated Development Environment (IDE)
 project files.  Since the IDEs configure their own environment
 one may launch CMake from any environment.
 
+.. _`Visual Studio Generators`:
+
+Visual Studio Generators
+^^^^^^^^^^^^^^^^^^^^^^^^
+
 .. toctree::
    :maxdepth: 1
 
@@ -65,6 +82,13 @@ one may launch CMake from any environment.
    /generator/Visual Studio 11 2012
    /generator/Visual Studio 12 2013
    /generator/Visual Studio 14 2015
+
+Xcode Generator
+^^^^^^^^^^^^^^^
+
+.. toctree::
+   :maxdepth: 1
+
    /generator/Xcode
 
 Extra Generators

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

Summary of changes:
 Help/manual/cmake-generators.7.rst |   26 +++++++++++++++++++++++++-
 1 file changed, 25 insertions(+), 1 deletion(-)


hooks/post-receive
-- 
CMake