mirror/CMake
1
0
Fork 0
mirror of https://github.com/Kitware/CMake.git synced 2026-04-30 11:10:06 -05:00
Code Issues Packages Projects Releases Wiki Activity

ci: Explicitly specify WiX architecture in packaging jobs

Browse Source
This commit is contained in:
Brad King
2024-03-07 16:43:36 -05:00
parent c1616c98bf
commit ac5aa7f1bf
2 changed files with 6 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
.gitlab/ci/configure_windows_i386_package.cmake
+3
View File
@@ -1,6 +1,9 @@
# CPack package file name component for this platform. # CPack package file name component for this platform.
set(CPACK_SYSTEM_NAME "windows-i386" CACHE STRING "") 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 # Use APIs from at most Windows 7
set(CMAKE_C_FLAGS "-D_WIN32_WINNT=0x601 -DNTDDI_VERSION=0x06010000" CACHE STRING "") 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 "") set(CMAKE_CXX_FLAGS "-GR -EHsc -D_WIN32_WINNT=0x601 -DNTDDI_VERSION=0x06010000" CACHE STRING "")
.gitlab/ci/configure_windows_x86_64_package.cmake
+3
View File
@@ -1,6 +1,9 @@
# CPack package file name component for this platform. # CPack package file name component for this platform.
set(CPACK_SYSTEM_NAME "windows-x86_64" CACHE STRING "") 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 # Use APIs from at most Windows 7
set(CMAKE_C_FLAGS "-D_WIN32_WINNT=0x601 -DNTDDI_VERSION=0x06010000" CACHE STRING "") 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 "") set(CMAKE_CXX_FLAGS "-GR -EHsc -D_WIN32_WINNT=0x601 -DNTDDI_VERSION=0x06010000" CACHE STRING "")