Bläddra i källkod

Merge topic 'cmake-version-rc'

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

Acked-by: Kitware Robot <[email protected]>
Merge-request: !3603
Brad King 6 år sedan
förälder
incheckning
579e27ec97
2 ändrade filer med 3 tillägg och 3 borttagningar
  1. 2 2
      Help/dev/maint.rst
  2. 1 1
      Source/CMakeVersion.cmake

+ 2 - 2
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::
 

+ 1 - 1
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)