Commit e97a4bed authored by Brad King's avatar Brad King
Browse files

Merge branch 'release-3.14'

parents 6f23321d bf1c2a25
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.
...@@ -7,8 +7,6 @@ CMake Release Notes ...@@ -7,8 +7,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
======== ========
......
# CMake version number components. # CMake version number components.
set(CMake_VERSION_MAJOR 3) set(CMake_VERSION_MAJOR 3)
set(CMake_VERSION_MINOR 13) set(CMake_VERSION_MINOR 14)
set(CMake_VERSION_PATCH 20190206) set(CMake_VERSION_PATCH 0)
#set(CMake_VERSION_RC 1) set(CMake_VERSION_RC 1)
set(CTEST_RUN_CURRENT_SCRIPT 0) set(CTEST_RUN_CURRENT_SCRIPT 0)
if(NOT VERSION) if(NOT VERSION)
set(VERSION 3.13) set(VERSION 3.14)
endif() endif()
if(NOT DEFINED PROJECT_PREFIX) if(NOT DEFINED PROJECT_PREFIX)
set(PROJECT_PREFIX cmake-${VERSION}) set(PROJECT_PREFIX cmake-${VERSION})
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment