diff options
| author | Brad King <brad.king@kitware.com> | 2018-03-09 15:50:25 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2018-03-09 15:52:49 (GMT) |
| commit | 588a1afe76ad0e5bed5d03403fa7b392cbbcd438 (patch) | |
| tree | a9de3cf543d0ab20f74c8e0b8e70101eee3a2a00 /Source/CMakeVersionCompute.cmake | |
| parent | 8c96f6ebbd4adda14023d257adc7d0541de7eca1 (diff) | |
| download | CMake-588a1afe76ad0e5bed5d03403fa7b392cbbcd438.zip CMake-588a1afe76ad0e5bed5d03403fa7b392cbbcd438.tar.gz CMake-588a1afe76ad0e5bed5d03403fa7b392cbbcd438.tar.bz2 | |
CMakeVersion.rc: Avoid leading zeros in integer version components
The split in commit v3.11.0-rc1~232^2 (CMakeVersion RC file: Split patch
into 2 components, 2017-12-01) can leave components "2018,0309", but the
latter is an octal constant with digit "9" out of range. Strip the
leading zero to express the components as "2018,309" so the resource
compiler treats them as decimal.
Diffstat (limited to 'Source/CMakeVersionCompute.cmake')
| -rw-r--r-- | Source/CMakeVersionCompute.cmake | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/Source/CMakeVersionCompute.cmake b/Source/CMakeVersionCompute.cmake index 79264ed..72a5800 100644 --- a/Source/CMakeVersionCompute.cmake +++ b/Source/CMakeVersionCompute.cmake @@ -32,7 +32,12 @@ endif() # components in the RC file are 16-bit integers so we may have to # split the patch component. if(CMake_VERSION_PATCH MATCHES "^([0-9]+)([0-9][0-9][0-9][0-9])$") - set(CMake_RCVERSION ${CMake_VERSION_MAJOR},${CMake_VERSION_MINOR},${CMAKE_MATCH_1},${CMAKE_MATCH_2}) + set(CMake_RCVERSION_YEAR "${CMAKE_MATCH_1}") + set(CMake_RCVERSION_MONTH_DAY "${CMAKE_MATCH_2}") + string(REGEX REPLACE "^0+" "" CMake_RCVERSION_MONTH_DAY "${CMake_RCVERSION_MONTH_DAY}") + set(CMake_RCVERSION ${CMake_VERSION_MAJOR},${CMake_VERSION_MINOR},${CMake_RCVERSION_YEAR},${CMake_RCVERSION_MONTH_DAY}) + unset(CMake_RCVERSION_MONTH_DAY) + unset(CMake_RCVERSION_YEAR) else() set(CMake_RCVERSION ${CMake_VERSION_MAJOR},${CMake_VERSION_MINOR},${CMake_VERSION_PATCH}) endif() |