diff options
| -rw-r--r-- | Help/dev/maint.rst | 10 | ||||
| -rw-r--r-- | Source/CMakeVersion.cmake | 2 | ||||
| -rw-r--r-- | Source/CMakeVersionCompute.cmake | 2 |
3 files changed, 7 insertions, 7 deletions
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 "") |