diff options
| author | Brad King <brad.king@kitware.com> | 2015-02-05 14:58:17 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2015-02-05 14:58:17 (GMT) |
| commit | 9da936e49d5d5eb3b60b2697eb99f2e4ed9809aa (patch) | |
| tree | a2f85e8ee0e36803c6b3b89721a697bd8a60b7f2 | |
| parent | 78c4418fa0a08b63a944ac66821e8bd95fdd73e0 (diff) | |
| parent | cb01f1517051b577d571e8fd21d210ef303f56c9 (diff) | |
| download | CMake-9da936e49d5d5eb3b60b2697eb99f2e4ed9809aa.zip CMake-9da936e49d5d5eb3b60b2697eb99f2e4ed9809aa.tar.gz CMake-9da936e49d5d5eb3b60b2697eb99f2e4ed9809aa.tar.bz2 | |
Merge branch 'release'
| -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 45d0a69..a058bc1 100644 --- a/Help/release/index.rst +++ b/Help/release/index.rst @@ -5,8 +5,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 a9b0511..8ffe8c4 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 1) -set(CMake_VERSION_PATCH 20150205) -#set(CMake_VERSION_RC 1) +set(CMake_VERSION_MINOR 2) +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 841f244..98fe3c5 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.1) + set(VERSION 3.2) endif() if(NOT DEFINED PROJECT_PREFIX) set(PROJECT_PREFIX cmake-${VERSION}) |