summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBrad King <brad.king@kitware.com>2019-11-07 15:24:35 (GMT)
committerKitware Robot <kwrobot@kitware.com>2019-11-07 15:25:44 (GMT)
commit0746a3398f4e22f80c19b6253c4df652f9c41214 (patch)
tree5ee50a426a464af5b1651075a3b183739de1629b
parent03e4fe65b0c4666ed46d0f2a7e2cfe00e30f7406 (diff)
parentf0c00bec1d7ce8f1209c4024e6000f907f11f1e9 (diff)
downloadCMake-0746a3398f4e22f80c19b6253c4df652f9c41214.zip
CMake-0746a3398f4e22f80c19b6253c4df652f9c41214.tar.gz
CMake-0746a3398f4e22f80c19b6253c4df652f9c41214.tar.bz2
Merge topic 'llvm-rc-fix' into release-3.16
f0c00bec1d CMakeVersion.rc: Fix build with llvm-rc Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4003
-rw-r--r--Source/CMakeLists.txt2
1 files changed, 1 insertions, 1 deletions
diff --git a/Source/CMakeLists.txt b/Source/CMakeLists.txt
index 63e08de..f4357e7 100644
--- a/Source/CMakeLists.txt
+++ b/Source/CMakeLists.txt
@@ -1177,7 +1177,7 @@ if(WIN32)
unset(CMake_RCVERSION_MONTH_DAY)
unset(CMake_RCVERSION_YEAR)
else()
- set(CMake_RCVERSION ${CMake_VERSION_MAJOR},${CMake_VERSION_MINOR},${CMake_VERSION_PATCH})
+ set(CMake_RCVERSION ${CMake_VERSION_MAJOR},${CMake_VERSION_MINOR},${CMake_VERSION_PATCH},0)
endif()
set(CMake_RCVERSION_STR ${CMake_VERSION})