Merge topic 'cmake-version-rc'

7b354baad5 CMakeVersion: Set CMake_VERSION_RC to 0 even in non-rc versions

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !3603
This commit is contained in:
Brad King
2019-07-25 13:26:45 +00:00
committed by Kitware Robot
2 changed files with 3 additions and 3 deletions
+2 -2
View File
@@ -217,7 +217,7 @@ note infrastructure and the version date from ``origin/master``:
sed -i $'/^Releases/ i\\\n.. include:: dev.txt\\\n' Help/release/index.rst
Update ``Source/CMakeVersion.cmake`` to set the version to
``$major.$minor.$date``:
``$major.$minor.$date`` (and RC ``0`` to disable the suffix):
.. code-block:: cmake
@@ -225,7 +225,7 @@ Update ``Source/CMakeVersion.cmake`` to set the version to
set(CMake_VERSION_MAJOR $major)
set(CMake_VERSION_MINOR $minor)
set(CMake_VERSION_PATCH $date)
#set(CMake_VERSION_RC 1)
set(CMake_VERSION_RC 0)
Commit with a message such as::
+1 -1
View File
@@ -2,4 +2,4 @@
set(CMake_VERSION_MAJOR 3)
set(CMake_VERSION_MINOR 15)
set(CMake_VERSION_PATCH 20190725)
#set(CMake_VERSION_RC 1)
set(CMake_VERSION_RC 0)