From 47a47f5ce011bf87231a42c1c597d547511a480a Mon Sep 17 00:00:00 2001 From: Brad King Date: Fri, 5 Jun 2020 08:26:11 -0400 Subject: Help: Drop development topic notes to prepare release Release versions do not have the development topic section of the CMake Release Notes index page. --- Help/release/dev/0-sample-topic.rst | 7 ------- Help/release/index.rst | 2 -- 2 files changed, 9 deletions(-) delete mode 100644 Help/release/dev/0-sample-topic.rst diff --git a/Help/release/dev/0-sample-topic.rst b/Help/release/dev/0-sample-topic.rst deleted file mode 100644 index e4cc01e..0000000 --- a/Help/release/dev/0-sample-topic.rst +++ /dev/null @@ -1,7 +0,0 @@ -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 cdc3e8b..4578b3a 100644 --- a/Help/release/index.rst +++ b/Help/release/index.rst @@ -7,8 +7,6 @@ CMake Release Notes This file should include the adjacent "dev.txt" file in development versions but not in release versions. -.. include:: dev.txt - Releases ======== -- cgit v0.12 From 7934352e44db7a7afeb4fdd07939ec8394a91a6b Mon Sep 17 00:00:00 2001 From: Brad King Date: Fri, 5 Jun 2020 08:27:04 -0400 Subject: Begin 3.18 release versioning --- Source/CMakeVersion.cmake | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Source/CMakeVersion.cmake b/Source/CMakeVersion.cmake index 562d083..b52bce6 100644 --- a/Source/CMakeVersion.cmake +++ b/Source/CMakeVersion.cmake @@ -1,8 +1,8 @@ # CMake version number components. set(CMake_VERSION_MAJOR 3) -set(CMake_VERSION_MINOR 17) -set(CMake_VERSION_PATCH 20200605) -#set(CMake_VERSION_RC 0) +set(CMake_VERSION_MINOR 18) +set(CMake_VERSION_PATCH 0) +set(CMake_VERSION_RC 0) set(CMake_VERSION_IS_DIRTY 0) # Start with the full version number used in tags. It has no dev info. -- cgit v0.12