[Cmake-commits] CMake branch, master, updated. v3.11.3-921-gacaaca9
Kitware Robot
kwrobot at kitware.com
Tue Jun 5 12:05:04 EDT 2018
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, master has been updated
via acaaca968c512fa420f3564649be1f49acfa6a6a (commit)
via 31bfad10d84eb6bf0035ccaab4eb3f93f0ab54dd (commit)
via af63c8bd6107e8fc8edd92add144019269a9bb2a (commit)
via 1566dc1e3bddeaccc91748c34e4a7cf22237e3f1 (commit)
from 90ebc32d9e7400a590973b30c99f2986bcb2b755 (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 -----------------------------------------------------------------
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=acaaca968c512fa420f3564649be1f49acfa6a6a
commit acaaca968c512fa420f3564649be1f49acfa6a6a
Author: Brad King <brad.king at kitware.com>
AuthorDate: Tue Jun 5 11:50:27 2018 -0400
Commit: Brad King <brad.king at kitware.com>
CommitDate: Tue Jun 5 11:50:27 2018 -0400
Begin post-3.12 development
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 4b32eab..4c9e96a 100644
--- a/Help/release/index.rst
+++ b/Help/release/index.rst
@@ -7,6 +7,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 f27f677..47607f3 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 12)
-set(CMake_VERSION_PATCH 0)
-set(CMake_VERSION_RC 1)
+set(CMake_VERSION_PATCH 20180605)
+#set(CMake_VERSION_RC 1)
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=31bfad10d84eb6bf0035ccaab4eb3f93f0ab54dd
commit 31bfad10d84eb6bf0035ccaab4eb3f93f0ab54dd
Merge: 90ebc32 af63c8b
Author: Brad King <brad.king at kitware.com>
AuthorDate: Tue Jun 5 11:49:08 2018 -0400
Commit: Brad King <brad.king at kitware.com>
CommitDate: Tue Jun 5 11:49:08 2018 -0400
Merge branch 'release-3.12'
-----------------------------------------------------------------------
Summary of changes:
Source/CMakeVersion.cmake | 2 +-
Utilities/Release/upload_release.cmake | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
hooks/post-receive
--
CMake
More information about the Cmake-commits
mailing list