[Cmake-commits] CMake branch, master, updated. v3.15.1-471-g8ce1897

[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  8ce189720ee8daafed4848ee9eb970f9e0546578 (commit)
       via  eb5ea5a505378e02df4d7e142d174b8917a3ef14 (commit)
      from  8fd481a899b651150d317cdfe448cbf628933e4d (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=8ce189720ee8daafed4848ee9eb970f9e0546578
commit 8ce189720ee8daafed4848ee9eb970f9e0546578
Merge: 8fd481a eb5ea5a
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Fri Jul 26 16:19:15 2019 +0000
Commit:     Kitware Robot <kwrobot at kitware.com>
CommitDate: Fri Jul 26 12:19:25 2019 -0400

    Merge topic 'cmake-version-rc'
    
    eb5ea5a505 CMakeVersion: Use '-rc0' version suffix on release branches prior to rc1
    
    Acked-by: Kitware Robot <kwrobot at kitware.com>
    Merge-request: !3609


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=eb5ea5a505378e02df4d7e142d174b8917a3ef14
commit eb5ea5a505378e02df4d7e142d174b8917a3ef14
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Fri Jul 26 08:04:58 2019 -0400
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Fri Jul 26 08:08:30 2019 -0400

    CMakeVersion: Use '-rc0' version suffix on release branches prior to rc1
    
    Revert the change from commit 7b354baad5 (CMakeVersion: Set
    CMake_VERSION_RC to 0 even in non-rc versions, 2019-07-25) and instead
    define a `0` value in `CMake_VERSION_RC` to mean `-rc0`.  This
    distinguishes release branch versions prior to the first release
    candidate from the first release candidate itself.  It also makes room
    for a dedicated "CMake $major.$minor.0-rc1" release commit for `-rc1` as
    we have for later release candidates and final releases.

diff --git a/Help/dev/maint.rst b/Help/dev/maint.rst
index a1732c8..75a1d68 100644
--- a/Help/dev/maint.rst
+++ b/Help/dev/maint.rst
@@ -178,7 +178,7 @@ Commit with a message such as::
   the CMake Release Notes index page.
 
 Update ``Source/CMakeVersion.cmake`` to set the version to
-``$major.$minor.0-rc1``:
+``$major.$minor.0-rc0``:
 
 .. code-block:: cmake
 
@@ -186,7 +186,7 @@ Update ``Source/CMakeVersion.cmake`` to set the version to
   set(CMake_VERSION_MAJOR $major)
   set(CMake_VERSION_MINOR $minor)
   set(CMake_VERSION_PATCH 0)
-  set(CMake_VERSION_RC 1)
+  set(CMake_VERSION_RC 0)
 
 Update uses of ``DEVEL_CMAKE_VERSION`` in the source tree to mention the
 actual version number:
@@ -197,7 +197,7 @@ actual version number:
 
 Commit with a message such as::
 
-  CMake $major.$minor.0-rc1 version update
+  Begin $ver release versioning
 
 Merge the ``release-$ver`` branch to ``master``:
 
@@ -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`` (and RC ``0`` to disable the suffix):
+``$major.$minor.$date``:
 
 .. 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 0)
+  #set(CMake_VERSION_RC 0)
 
 Commit with a message such as::
 
diff --git a/Source/CMakeVersion.cmake b/Source/CMakeVersion.cmake
index 942ead0..ea3b43a 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 20190726)
-set(CMake_VERSION_RC 0)
+#set(CMake_VERSION_RC 0)
diff --git a/Source/CMakeVersionCompute.cmake b/Source/CMakeVersionCompute.cmake
index 72a5800..160f470 100644
--- a/Source/CMakeVersionCompute.cmake
+++ b/Source/CMakeVersionCompute.cmake
@@ -16,7 +16,7 @@ endif()
 set(CMake_VERSION ${CMake_VERSION_MAJOR}.${CMake_VERSION_MINOR}.${CMake_VERSION_PATCH})
 if(CMake_VERSION_SOURCE)
   set(CMake_VERSION_SUFFIX "${CMake_VERSION_SOURCE}")
-elseif(CMake_VERSION_RC)
+elseif(DEFINED CMake_VERSION_RC)
   set(CMake_VERSION_SUFFIX "rc${CMake_VERSION_RC}")
 else()
   set(CMake_VERSION_SUFFIX "")

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

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


hooks/post-receive
-- 
CMake