Skip to content

Commit 6bc6107

Browse files
committed
Ensure the MCCODE_MAJOR/MINOR/PATCH vars have a meaning also if presented with a non-x.y.z version tag
1 parent ab3df08 commit 6bc6107

File tree

2 files changed

+30
-10
lines changed

2 files changed

+30
-10
lines changed

cmake/Modules/InstallMCCODE.cmake

Lines changed: 15 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -37,11 +37,21 @@ macro(installMCCODE)
3737

3838
# Split incoming MCCODE_VERSION to list
3939
string(REPLACE "." ";" MCCODE_VERSION_LIST ${MCCODE_VERSION})
40-
41-
## Package versioning
42-
list(GET MCCODE_VERSION_LIST 0 MCCODE_MAJOR)
43-
list(GET MCCODE_VERSION_LIST 1 MCCODE_MINOR)
44-
list(GET MCCODE_VERSION_LIST 2 MCCODE_PATCH)
40+
list(LENGTH MCCODE_VERSION_LIST MCCODE_VERSION_LIST_LEN)
41+
42+
## CPack Package versioning
43+
set(MCCODE_MAJOR 3)
44+
set(MCCODE_MINOR 999)
45+
set(MCCODE_PATCH 999)
46+
if (${MCCODE_VERSION_LIST_LEN} GREATER 0)
47+
list(GET MCCODE_VERSION_LIST 0 MCCODE_MAJOR)
48+
endif()
49+
if (${MCCODE_VERSION_LIST_LEN} GREATER 1)
50+
list(GET MCCODE_VERSION_LIST 1 MCCODE_MINOR)
51+
endif()
52+
if (${MCCODE_VERSION_LIST_LEN} GREATER 2)
53+
list(GET MCCODE_VERSION_LIST 2 MCCODE_PATCH)
54+
endif()
4555

4656
set(CPACK_PACKAGE_VERSION "${MCCODE_MAJOR}.${MCCODE_MINOR}.${MCCODE_PATCH}")
4757
set(CPACK_PACKAGE_VERSION_MAJOR "${MCCODE_MAJOR}")

cmake/Modules/MCUtil.cmake

Lines changed: 15 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -152,11 +152,21 @@ macro(setupMCCODE FLAVOR)
152152

153153
# Split incoming MCCODE_VERSION to list
154154
string(REPLACE "." ";" MCCODE_VERSION_LIST ${MCCODE_VERSION})
155-
156-
## Package versioning
157-
list(GET MCCODE_VERSION_LIST 0 MCCODE_MAJOR)
158-
list(GET MCCODE_VERSION_LIST 1 MCCODE_MINOR)
159-
list(GET MCCODE_VERSION_LIST 2 MCCODE_PATCH)
155+
list(LENGTH MCCODE_VERSION_LIST MCCODE_VERSION_LIST_LEN)
156+
157+
## CPack Package versioning
158+
set(MCCODE_MAJOR 3)
159+
set(MCCODE_MINOR 999)
160+
set(MCCODE_PATCH 999)
161+
if (${MCCODE_VERSION_LIST_LEN} GREATER 0)
162+
list(GET MCCODE_VERSION_LIST 0 MCCODE_MAJOR)
163+
endif()
164+
if (${MCCODE_VERSION_LIST_LEN} GREATER 1)
165+
list(GET MCCODE_VERSION_LIST 1 MCCODE_MINOR)
166+
endif()
167+
if (${MCCODE_VERSION_LIST_LEN} GREATER 2)
168+
list(GET MCCODE_VERSION_LIST 2 MCCODE_PATCH)
169+
endif()
160170

161171
set(CPACK_PACKAGE_VERSION "${MCCODE_MAJOR}.${MCCODE_MINOR}.${MCCODE_PATCH}")
162172
set(CPACK_PACKAGE_VERSION_MAJOR "${MCCODE_MAJOR}")

0 commit comments

Comments
 (0)