Skip to content

Commit 0b1f158

Browse files
committed
[cmake] Adapt to fix in version macros
now minor and patch numbers which are <10 are not prepended with a 0 not to incur into invalid octals, i.e. 08 and 09.
1 parent cf72c88 commit 0b1f158

File tree

1 file changed

+10
-2
lines changed

1 file changed

+10
-2
lines changed

cmake/modules/SetROOTVersion.cmake

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,9 +22,17 @@ function(SET_VERSION_FROM_FILE)
2222
string(REGEX MATCH "#define ROOT_VERSION_MAJOR ([0-9]*)" _ ${versionstr})
2323
set(ROOT_MAJOR_VERSION ${CMAKE_MATCH_1})
2424
string(REGEX MATCH "#define ROOT_VERSION_MINOR ([0-9]*)" _ ${versionstr})
25-
set(ROOT_MINOR_VERSION ${CMAKE_MATCH_1})
25+
if (CMAKE_MATCH_1 LESS 10)
26+
set(ROOT_MINOR_VERSION "0${CMAKE_MATCH_1}")
27+
else()
28+
set(ROOT_MINOR_VERSION ${CMAKE_MATCH_1})
29+
endif()
2630
string(REGEX MATCH "#define ROOT_VERSION_PATCH ([0-9]*)" _ ${versionstr})
27-
set(ROOT_PATCH_VERSION ${CMAKE_MATCH_1})
31+
if (CMAKE_MATCH_1 LESS 10)
32+
set(ROOT_PATCH_VERSION "0${CMAKE_MATCH_1}")
33+
else()
34+
set(ROOT_PATCH_VERSION ${CMAKE_MATCH_1})
35+
endif()
2836

2937
set(ROOT_MAJOR_VERSION "${ROOT_MAJOR_VERSION}" PARENT_SCOPE)
3038
set(ROOT_MINOR_VERSION "${ROOT_MINOR_VERSION}" PARENT_SCOPE)

0 commit comments

Comments
 (0)