summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBrad King <brad.king@kitware.com>2013-10-18 14:02:51 (GMT)
committerCMake Topic Stage <kwrobot@kitware.com>2013-10-18 14:02:51 (GMT)
commit36d8d987c705dd693454f3157f7d8c0f50b9f0ff (patch)
treec68227e30f4f0ee2470d10f3d6b3af1d50d2f7e8
parentde5159236d7e6259d38b3e4ef03305898ff9e7bd (diff)
parent89448a5bada1d5e18edfe70094e9a2e9fc6ca9f4 (diff)
downloadCMake-36d8d987c705dd693454f3157f7d8c0f50b9f0ff.zip
CMake-36d8d987c705dd693454f3157f7d8c0f50b9f0ff.tar.gz
CMake-36d8d987c705dd693454f3157f7d8c0f50b9f0ff.tar.bz2
Merge topic 'help-replace-version'
89448a5 cmRST: Substitute CMake version for |release| as Sphinx does
-rw-r--r--Source/cmRST.cxx2
1 files changed, 2 insertions, 0 deletions
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();
}
//----------------------------------------------------------------------------