浏览代码

Merge branch 'release'

Brad King 9 年之前
父节点
当前提交
b2ef225ab9
共有 4 个文件被更改,包括 4 次插入13 次删除
  1. 0 7
      Help/release/dev/0-sample-topic.rst
  2. 0 2
      Help/release/index.rst
  3. 3 3
      Source/CMakeVersion.cmake
  4. 1 1
      Utilities/Release/upload_release.cmake

+ 0 - 7
Help/release/dev/0-sample-topic.rst

@@ -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.

+ 0 - 2
Help/release/index.rst

@@ -5,8 +5,6 @@ CMake Release Notes
   This file should include the adjacent "dev.txt" file
   This file should include the adjacent "dev.txt" file
   in development versions but not in release versions.
   in development versions but not in release versions.
 
 
-.. include:: dev.txt
-
 Releases
 Releases
 ========
 ========
 
 

+ 3 - 3
Source/CMakeVersion.cmake

@@ -1,5 +1,5 @@
 # CMake version number components.
 # CMake version number components.
 set(CMake_VERSION_MAJOR 3)
 set(CMake_VERSION_MAJOR 3)
-set(CMake_VERSION_MINOR 5)
-set(CMake_VERSION_PATCH 20160601)
-#set(CMake_VERSION_RC 1)
+set(CMake_VERSION_MINOR 6)
+set(CMake_VERSION_PATCH 0)
+set(CMake_VERSION_RC 1)

+ 1 - 1
Utilities/Release/upload_release.cmake

@@ -1,6 +1,6 @@
 set(CTEST_RUN_CURRENT_SCRIPT 0)
 set(CTEST_RUN_CURRENT_SCRIPT 0)
 if(NOT VERSION)
 if(NOT VERSION)
- set(VERSION 3.5)
+ set(VERSION 3.6)
 endif()
 endif()
 if(NOT DEFINED PROJECT_PREFIX)
 if(NOT DEFINED PROJECT_PREFIX)
   set(PROJECT_PREFIX cmake-${VERSION})
   set(PROJECT_PREFIX cmake-${VERSION})