Merge branch 'release'
This commit is contained in:
commit
9da936e49d
|
@ -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.
|
|
@ -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
|
||||
========
|
||||
|
||||
|
|
|
@ -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)
|
||||
|
|
|
@ -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})
|
||||
|
|
Loading…
Reference in New Issue