diff options
| author | Brad King <brad.king@kitware.com> | 2019-02-06 15:09:19 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2019-02-06 15:09:19 (GMT) |
| commit | e97a4bed4f35e2508227460b0c537c9868925a6e (patch) | |
| tree | 4371bdb48f03e297e420adcfbc30de3ca1541930 | |
| parent | 6f23321d405930241fa431cfda7650f2993f0c19 (diff) | |
| parent | bf1c2a2593e28c4e754420df6984f7f0f183e930 (diff) | |
| download | CMake-e97a4bed4f35e2508227460b0c537c9868925a6e.zip CMake-e97a4bed4f35e2508227460b0c537c9868925a6e.tar.gz CMake-e97a4bed4f35e2508227460b0c537c9868925a6e.tar.bz2 | |
Merge branch 'release-3.14'
| -rw-r--r-- | Help/release/dev/0-sample-topic.rst | 7 | ||||
| -rw-r--r-- | Help/release/index.rst | 2 | ||||
| -rw-r--r-- | Source/CMakeVersion.cmake | 6 | ||||
| -rw-r--r-- | Utilities/Release/upload_release.cmake | 2 |
4 files changed, 4 insertions, 13 deletions
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 2318e03..4fcd4ca 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 ======== diff --git a/Source/CMakeVersion.cmake b/Source/CMakeVersion.cmake index 324d825..ffb88ef 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 13) -set(CMake_VERSION_PATCH 20190206) -#set(CMake_VERSION_RC 1) +set(CMake_VERSION_MINOR 14) +set(CMake_VERSION_PATCH 0) +set(CMake_VERSION_RC 1) diff --git a/Utilities/Release/upload_release.cmake b/Utilities/Release/upload_release.cmake index bbc7437..3613ae7 100644 --- a/Utilities/Release/upload_release.cmake +++ b/Utilities/Release/upload_release.cmake @@ -1,6 +1,6 @@ set(CTEST_RUN_CURRENT_SCRIPT 0) if(NOT VERSION) - set(VERSION 3.13) + set(VERSION 3.14) endif() if(NOT DEFINED PROJECT_PREFIX) set(PROJECT_PREFIX cmake-${VERSION}) |