Skip to content

Commit 0b43c19

Browse files
committed
Format APPX_SDK_VERSION correctly
1 parent 114d840 commit 0b43c19

File tree

1 file changed

+13
-1
lines changed

1 file changed

+13
-1
lines changed

lib/cmake-scripts/cntp-winappx.cmake

Lines changed: 13 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,10 +7,22 @@ function(cntp_winappx target appxmanifest)
77

88
cntp_repoversion(REPOVERSION)
99

10+
11+
string(REGEX REPLACE "\\." ";" APPX_SDK_VERSION_PARTS ${CMAKE_SYSTEM_VERSION})
12+
13+
# Default versions to 0 if they can't be found - the list will always have at least 4 elements
14+
list(APPEND APPX_SDK_VERSION_PARTS 0 0 0 0)
15+
list(POP_FRONT APPX_SDK_VERSION_PARTS APPX_SDK_VERSION_MAJOR APPX_SDK_VERSION_MINOR APPX_SDK_VERSION_REVISION APPX_SDK_VERSION_BUILD)
16+
17+
set(${outvar}_MAJOR ${${outvar}_MAJOR} PARENT_SCOPE)
18+
set(${outvar}_MINOR ${${outvar}_MINOR} PARENT_SCOPE)
19+
set(${outvar}_REVISION ${${outvar}_REVISION} PARENT_SCOPE)
20+
set(${outvar}_BUILD ${GIT_REVLIST_OUTPUT} PARENT_SCOPE)
21+
1022
set(APPX_EXECUTABLE_NAME ${APPX_EXECUTABLE_NAME}.exe)
1123
set(APPX_ARCH x64) # TODO: Update
1224
set(APPX_VERSION ${REPOVERSION_MAJOR}.${REPOVERSION_MINOR}.${REPOVERSION_REVISION}.0)
13-
set(APPX_SDK_VERSION ${CMAKE_SYSTEM_VERSION})
25+
set(APPX_SDK_VERSION ${APPX_SDK_VERSION_MAJOR}.${APPX_SDK_VERSION_MINOR}.${APPX_SDK_VERSION_REVISION}.${APPX_SDK_VERSION_BUILD})
1426
configure_file(${appxmanifest} appxmanifest.xml)
1527
endif()
1628
endfunction()

0 commit comments

Comments
 (0)