[Cmake-commits] CMake branch, next, updated. v2.8.12-4111-g57da689

[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  57da68971626833f00d424addadaa66b3e287801 (commit)
       via  89448a5bada1d5e18edfe70094e9a2e9fc6ca9f4 (commit)
      from  b8109ab36500febe7e1853355322ad4e835cb6c4 (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=57da68971626833f00d424addadaa66b3e287801
commit 57da68971626833f00d424addadaa66b3e287801
Merge: b8109ab 89448a5
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Thu Oct 17 15:24:38 2013 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Thu Oct 17 15:24:38 2013 -0400

    Merge topic 'help-replace-version' into next
    
    89448a5 cmRST: Substitute CMake version for |release| as Sphinx does


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=89448a5bada1d5e18edfe70094e9a2e9fc6ca9f4
commit 89448a5bada1d5e18edfe70094e9a2e9fc6ca9f4
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Thu Oct 17 15:16:44 2013 -0400
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Thu Oct 17 15:23:45 2013 -0400

    cmRST: Substitute CMake version for |release| as Sphinx does
    
    Sphinx provides a builtin substitution for the |release| version.
    Teach cmRST to replace this with the CMake version number too.

diff --git a/Source/cmRST.cxx b/Source/cmRST.cxx
index 72c42d6..18a197b 100644
--- a/Source/cmRST.cxx
+++ b/Source/cmRST.cxx
@@ -12,6 +12,7 @@
 #include "cmRST.h"
 
 #include "cmSystemTools.h"
+#include "cmVersion.h"
 
 #include <ctype.h>
 
@@ -41,6 +42,7 @@ cmRST::cmRST(std::ostream& os, std::string const& docroot):
                "((\\|[^| \t\r\n]([^|\r\n]*[^| \t\r\n])?\\|)(__|_|))"
                "([^A-Za-z0-9_]|$)")
 {
+  this->Replace["|release|"] = cmVersion::GetCMakeVersion();
 }
 
 //----------------------------------------------------------------------------

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

Summary of changes:
 Source/cmRST.cxx |    2 ++
 1 files changed, 2 insertions(+), 0 deletions(-)


hooks/post-receive
-- 
CMake