From ac5aa7f1bffecb7bc9abc53a0ce541c248b8d33c Mon Sep 17 00:00:00 2001 From: Brad King Date: Thu, 7 Mar 2024 16:43:36 -0500 Subject: ci: Explicitly specify WiX architecture in packaging jobs --- .gitlab/ci/configure_windows_i386_package.cmake | 3 +++ .gitlab/ci/configure_windows_x86_64_package.cmake | 3 +++ 2 files changed, 6 insertions(+) diff --git a/.gitlab/ci/configure_windows_i386_package.cmake b/.gitlab/ci/configure_windows_i386_package.cmake index 65e1dcb..c80ebcc 100644 --- a/.gitlab/ci/configure_windows_i386_package.cmake +++ b/.gitlab/ci/configure_windows_i386_package.cmake @@ -1,6 +1,9 @@ # CPack package file name component for this platform. set(CPACK_SYSTEM_NAME "windows-i386" CACHE STRING "") +# Tell WiX to package for this architecture. +set(CPACK_WIX_ARCHITECTURE "x86" CACHE STRING "") + # Use APIs from at most Windows 7 set(CMAKE_C_FLAGS "-D_WIN32_WINNT=0x601 -DNTDDI_VERSION=0x06010000" CACHE STRING "") set(CMAKE_CXX_FLAGS "-GR -EHsc -D_WIN32_WINNT=0x601 -DNTDDI_VERSION=0x06010000" CACHE STRING "") diff --git a/.gitlab/ci/configure_windows_x86_64_package.cmake b/.gitlab/ci/configure_windows_x86_64_package.cmake index 3a141a7..051e3fc 100644 --- a/.gitlab/ci/configure_windows_x86_64_package.cmake +++ b/.gitlab/ci/configure_windows_x86_64_package.cmake @@ -1,6 +1,9 @@ # CPack package file name component for this platform. set(CPACK_SYSTEM_NAME "windows-x86_64" CACHE STRING "") +# Tell WiX to package for this architecture. +set(CPACK_WIX_ARCHITECTURE "x64" CACHE STRING "") + # Use APIs from at most Windows 7 set(CMAKE_C_FLAGS "-D_WIN32_WINNT=0x601 -DNTDDI_VERSION=0x06010000" CACHE STRING "") set(CMAKE_CXX_FLAGS "-GR -EHsc -D_WIN32_WINNT=0x601 -DNTDDI_VERSION=0x06010000" CACHE STRING "") -- cgit v0.12