[Cmake-commits] CMake branch, next, updated. v3.0.0-rc6-3541-gde15005

[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  de150055b3a2d16751a72594979edfc53a153112 (commit)
       via  7eef823e14e98fc003931ec426fee3033e83381e (commit)
       via  5fb9b16d0cfcd16957818dfcaaf530d6dd432a69 (commit)
       via  95135ac3362148139bf7f56bbb0894d1294ed65a (commit)
      from  ba25869f5ff1fa5c1d3f26096ff0bd969e63d21d (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=de150055b3a2d16751a72594979edfc53a153112
commit de150055b3a2d16751a72594979edfc53a153112
Merge: ba25869 7eef823
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Thu Jun 5 06:06:17 2014 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Thu Jun 5 06:06:17 2014 -0400

    Merge topic 'minor-help-cleanup' into next
    
    7eef823e Help: Add comma to assist parsing of ctest_build command docs.
    5fb9b16d Help: Document that file(GENERATE) re-writes only when needed.
    95135ac3 Help: Add missing external link marker.


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=7eef823e14e98fc003931ec426fee3033e83381e
commit 7eef823e14e98fc003931ec426fee3033e83381e
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Thu Jun 5 11:58:49 2014 +0200
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Thu Jun 5 11:58:49 2014 +0200

    Help: Add comma to assist parsing of ctest_build command docs.

diff --git a/Help/command/ctest_build.rst b/Help/command/ctest_build.rst
index 1347b42..4a95cdd 100644
--- a/Help/command/ctest_build.rst
+++ b/Help/command/ctest_build.rst
@@ -23,7 +23,7 @@ The APPEND option marks results for append to those previously
 submitted to a dashboard server since the last ctest_start.  Append
 semantics are defined by the dashboard server in use.
 
-If set the contents of the variable CTEST_BUILD_FLAGS are passed as
+If set, the contents of the variable CTEST_BUILD_FLAGS are passed as
 additional arguments to the underlying build command. This can e.g. be
 used to trigger a parallel build using the -j option of make. See
 :module:`ProcessorCount` for an example.

http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=5fb9b16d0cfcd16957818dfcaaf530d6dd432a69
commit 5fb9b16d0cfcd16957818dfcaaf530d6dd432a69
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Thu Jun 5 11:58:02 2014 +0200
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Thu Jun 5 11:58:02 2014 +0200

    Help: Document that file(GENERATE) re-writes only when needed.

diff --git a/Help/command/file.rst b/Help/command/file.rst
index 14ca20c..869350a 100644
--- a/Help/command/file.rst
+++ b/Help/command/file.rst
@@ -271,6 +271,8 @@ from the input content to produce the output content.  The options are:
 
 Exactly one ``CONTENT`` or ``INPUT`` option must be given.  A specific
 ``OUTPUT`` file may be named by at most one invocation of ``file(GENERATE)``.
+Generated files are modified on subsequent cmake runs only if their content
+is changed.
 
 ------------------------------------------------------------------------------
 

http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=95135ac3362148139bf7f56bbb0894d1294ed65a
commit 95135ac3362148139bf7f56bbb0894d1294ed65a
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Thu Jun 5 11:57:25 2014 +0200
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Thu Jun 5 11:57:25 2014 +0200

    Help: Add missing external link marker.

diff --git a/Help/prop_gbl/CMAKE_CXX_KNOWN_FEATURES.rst b/Help/prop_gbl/CMAKE_CXX_KNOWN_FEATURES.rst
index cf35467..bdeabdb 100644
--- a/Help/prop_gbl/CMAKE_CXX_KNOWN_FEATURES.rst
+++ b/Help/prop_gbl/CMAKE_CXX_KNOWN_FEATURES.rst
@@ -185,7 +185,7 @@ The features known to this version of CMake are:
   .. _N3050: http://www.open-std.org/jtc1/sc22/wg21/docs/papers/2010/n3050.html
 
 ``cxx_nonstatic_member_init``
-  Non-static data member initialization, as defined in N2756.
+  Non-static data member initialization, as defined in N2756_.
 
   .. _N2756: http://www.open-std.org/jtc1/sc22/wg21/docs/papers/2008/n2756.htm
 

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

Summary of changes:
 Help/command/ctest_build.rst               |    2 +-
 Help/command/file.rst                      |    2 ++
 Help/prop_gbl/CMAKE_CXX_KNOWN_FEATURES.rst |    2 +-
 3 files changed, 4 insertions(+), 2 deletions(-)


hooks/post-receive
-- 
CMake