diff options
| author | Brad King <brad.king@kitware.com> | 2019-07-25 13:26:45 (GMT) |
|---|---|---|
| committer | Kitware Robot <kwrobot@kitware.com> | 2019-07-25 13:26:55 (GMT) |
| commit | 579e27ec97101d36d0f42d47bd7aa9c753b15be0 (patch) | |
| tree | 615cd0bb5a07121a89aa7a09c65df11230123308 | |
| parent | a1c6d7e9af5a241b1afa29b3f7459ee9ee4ec77a (diff) | |
| parent | 7b354baad55454e8ef441b0f8e195b93d5caa974 (diff) | |
| download | CMake-579e27ec97101d36d0f42d47bd7aa9c753b15be0.zip CMake-579e27ec97101d36d0f42d47bd7aa9c753b15be0.tar.gz CMake-579e27ec97101d36d0f42d47bd7aa9c753b15be0.tar.bz2 | |
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
| -rw-r--r-- | Help/dev/maint.rst | 4 | ||||
| -rw-r--r-- | Source/CMakeVersion.cmake | 2 |
2 files changed, 3 insertions, 3 deletions
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) |