Packaging: Fix up windows artifact names

For the slint-compiler, we use ${CMAKE_SYSTEM_PROCESSOR}, which on Windows is - unfortunately - derived from the PROCESSOR_ARCHITECTURE environment variable, and
thus AMD64 or ARM64. Fix the package suffix on the CI side.

We could try to make the cmake variable to known values and then arm64/x86_64, but I'd rather stick with less exceptions when these names are not really visible in the documentation or our users.

The same applies to the C++ packages, where the CMake/Windows suffix (AMD64/ARM64) works better with FindSlint.cmake's use of the corresponding variable.

Similarly, the tool binaries were called
slint-viewer-windows-aarch64-pc-windows-msvc, but neither the compiler, nor the rest of the triplet is needed, merely the architecture. So rename it to slint-viewer-windows-arm64 and x86_64. Here we don't need cmake and can use the "correct" suffixes.
This commit is contained in:
Simon Hausmann 2025-06-17 11:27:25 +02:00 committed by Simon Hausmann
parent 04d2d2e8b9
commit 54bb2d39ad
4 changed files with 12 additions and 10 deletions

View file

@ -36,7 +36,7 @@ if (NOT SLINT_TARGET_ARCHITECTURE)
else()
set(CPACK_SYSTEM_NAME win32)
endif()
set(SLINT_TARGET_ARCHITECTURE "${CPACK_SYSTEM_NAME}${compiler_suffix}")
set(SLINT_TARGET_ARCHITECTURE "${CPACK_SYSTEM_NAME}${compiler_suffix}-${CMAKE_SYSTEM_PROCESSOR}")
elseif (CONFIG_IDF_TARGET_ARCH_XTENSA)
set(SLINT_TARGET_ARCHITECTURE "xtensa-${IDF_TARGET}-none-elf")
elseif(CONFIG_IDF_TARGET_ARCH_RISCV)