diff options
| author | Brad King <brad.king@kitware.com> | 2019-07-26 16:19:15 (GMT) |
|---|---|---|
| committer | Kitware Robot <kwrobot@kitware.com> | 2019-07-26 16:19:25 (GMT) |
| commit | 8ce189720ee8daafed4848ee9eb970f9e0546578 (patch) | |
| tree | 3f6be4b3116c6ea1c86af5466a20a7e3b7112f15 /Source | |
| parent | 8fd481a899b651150d317cdfe448cbf628933e4d (diff) | |
| parent | eb5ea5a505378e02df4d7e142d174b8917a3ef14 (diff) | |
| download | CMake-8ce189720ee8daafed4848ee9eb970f9e0546578.zip CMake-8ce189720ee8daafed4848ee9eb970f9e0546578.tar.gz CMake-8ce189720ee8daafed4848ee9eb970f9e0546578.tar.bz2 | |
Merge topic 'cmake-version-rc'
eb5ea5a505 CMakeVersion: Use '-rc0' version suffix on release branches prior to rc1
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !3609
Diffstat (limited to 'Source')
| -rw-r--r-- | Source/CMakeVersion.cmake | 2 | ||||
| -rw-r--r-- | Source/CMakeVersionCompute.cmake | 2 |
2 files changed, 2 insertions, 2 deletions
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 "") |