summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBrad King <brad.king@kitware.com>2017-06-05 14:41:19 (GMT)
committerBrad King <brad.king@kitware.com>2017-06-05 14:41:19 (GMT)
commitc095e90f3af78fb3421c80b725ebc6ad9ec85999 (patch)
tree83b713bafa0a61f9213ba395c89d60edef0d8038
parentfc812c0dcba77c9e2d57a2404cc1cc83c52de52c (diff)
downloadCMake-c095e90f3af78fb3421c80b725ebc6ad9ec85999.zip
CMake-c095e90f3af78fb3421c80b725ebc6ad9ec85999.tar.gz
CMake-c095e90f3af78fb3421c80b725ebc6ad9ec85999.tar.bz2
Begin post-3.9 development
-rw-r--r--Help/release/dev/0-sample-topic.rst7
-rw-r--r--Help/release/index.rst2
-rw-r--r--Source/CMakeVersion.cmake4
3 files changed, 11 insertions, 2 deletions
diff --git a/Help/release/dev/0-sample-topic.rst b/Help/release/dev/0-sample-topic.rst
new file mode 100644
index 0000000..e4cc01e
--- /dev/null
+++ b/Help/release/dev/0-sample-topic.rst
@@ -0,0 +1,7 @@
+0-sample-topic
+--------------
+
+* This is a sample release note for the change in a topic.
+ Developers should add similar notes for each topic branch
+ making a noteworthy change. Each document should be named
+ and titled to match the topic name to avoid merge conflicts.
diff --git a/Help/release/index.rst b/Help/release/index.rst
index 8222d0c..7f481a3 100644
--- a/Help/release/index.rst
+++ b/Help/release/index.rst
@@ -5,6 +5,8 @@ CMake Release Notes
This file should include the adjacent "dev.txt" file
in development versions but not in release versions.
+.. include:: dev.txt
+
Releases
========
diff --git a/Source/CMakeVersion.cmake b/Source/CMakeVersion.cmake
index 22b58a9..ff1e260 100644
--- a/Source/CMakeVersion.cmake
+++ b/Source/CMakeVersion.cmake
@@ -1,5 +1,5 @@
# CMake version number components.
set(CMake_VERSION_MAJOR 3)
set(CMake_VERSION_MINOR 9)
-set(CMake_VERSION_PATCH 0)
-set(CMake_VERSION_RC 1)
+set(CMake_VERSION_PATCH 20170605)
+#set(CMake_VERSION_RC 1)