[Cmake-commits] CMake branch, master, updated. v3.15.0-461-g579e27e

[Kitware Robot]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "CMake".

The branch, master has been updated
       via  579e27ec97101d36d0f42d47bd7aa9c753b15be0 (commit)
       via  7b354baad55454e8ef441b0f8e195b93d5caa974 (commit)
      from  a1c6d7e9af5a241b1afa29b3f7459ee9ee4ec77a (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=579e27ec97101d36d0f42d47bd7aa9c753b15be0
commit 579e27ec97101d36d0f42d47bd7aa9c753b15be0
Merge: a1c6d7e 7b354ba
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Thu Jul 25 13:26:45 2019 +0000
Commit:     Kitware Robot <kwrobot at kitware.com>
CommitDate: Thu Jul 25 09:26:55 2019 -0400

    Merge topic 'cmake-version-rc'
    
    7b354baad5 CMakeVersion: Set CMake_VERSION_RC to 0 even in non-rc versions
    
    Acked-by: Kitware Robot <kwrobot at kitware.com>
    Merge-request: !3603


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=7b354baad55454e8ef441b0f8e195b93d5caa974
commit 7b354baad55454e8ef441b0f8e195b93d5caa974
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Thu Jul 25 08:04:24 2019 -0400
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Thu Jul 25 09:23:48 2019 -0400

    CMakeVersion: Set CMake_VERSION_RC to 0 even in non-rc versions
    
    The logic that uses this value already ignores any "false" value, so `0`
    is just as good as not being set at all.  Using `0` for this role makes
    the version components look more symmetric and reduces the number of
    edits needed when creating releases.

diff --git a/Help/dev/maint.rst b/Help/dev/maint.rst
index 1153a09..a1732c8 100644
--- a/Help/dev/maint.rst
+++ b/Help/dev/maint.rst
@@ -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::
 
diff --git a/Source/CMakeVersion.cmake b/Source/CMakeVersion.cmake
index f4875fb..6a1d61f 100644
--- a/Source/CMakeVersion.cmake
+++ b/Source/CMakeVersion.cmake
@@ -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)

-----------------------------------------------------------------------

Summary of changes:
 Help/dev/maint.rst        | 4 ++--
 Source/CMakeVersion.cmake | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)


hooks/post-receive
-- 
CMake