kolan
/
CMake
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'release'

This commit is contained in:
Brad King 2015-06-02 11:19:18 -04:00
parent a6916a6c6e c2cb80cbfa
commit 4a96a4e3be
4 changed files with 4 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
Help/release/dev/0-sample-topic.rst
View File

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

2
Help/release/index.rst
View File

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

6
Source/CMakeVersion.cmake
View File

@ -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 2) set(CMake_VERSION_MINOR 3)
set(CMake_VERSION_PATCH 20150602) set(CMake_VERSION_PATCH 0)
#set(CMake_VERSION_RC 1) set(CMake_VERSION_RC 1)

2
Utilities/Release/upload_release.cmake
View File

@ -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.2) set(VERSION 3.3)
endif() endif()
if(NOT DEFINED PROJECT_PREFIX) if(NOT DEFINED PROJECT_PREFIX)
set(PROJECT_PREFIX cmake-${VERSION}) set(PROJECT_PREFIX cmake-${VERSION})