diff options
| author | Brad King <brad.king@kitware.com> | 2015-06-02 15:19:18 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2015-06-02 15:19:18 (GMT) |
| commit | 4a96a4e3bead6dfbcdfc7953739f2cd135c1af0c (patch) | |
| tree | c0596ff89727523c3f6772680a76aac625ae4e39 | |
| parent | a6916a6c6e397bda8b381f65dbfc59d3c52f8525 (diff) | |
| parent | c2cb80cbfa25eb5d6e054693ebd18e74bd7c8b75 (diff) | |
| download | CMake-4a96a4e3bead6dfbcdfc7953739f2cd135c1af0c.zip CMake-4a96a4e3bead6dfbcdfc7953739f2cd135c1af0c.tar.gz CMake-4a96a4e3bead6dfbcdfc7953739f2cd135c1af0c.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 b558e9d..6b98e48 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 4db774f..727cbcc 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 2) -set(CMake_VERSION_PATCH 20150602) -#set(CMake_VERSION_RC 1) +set(CMake_VERSION_MINOR 3) +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 98fe3c5..ac41300 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.2) + set(VERSION 3.3) endif() if(NOT DEFINED PROJECT_PREFIX) set(PROJECT_PREFIX cmake-${VERSION}) |