echo/CMake
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Tests: Teach RunCMake.CPack_WIX to honor windows-arm64 hosts

Browse Source
This commit is contained in:
Brad King 2024-03-18 15:09:54 -04:00
parent 9c472b9482
commit 406e207e74
3 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Tests/RunCMake/CPack_WIX/AppWiX-cpack-WIX-stdout.txt
View File

@ -8,4 +8,4 @@ CPack: - Install component: headers
CPack: - Install component: libraries CPack: - Install component: libraries
CPack: Create package CPack: Create package
CPack: - package: [^ CPack: - package: [^
]*/Tests/RunCMake/CPack_WIX/AppWiX-build/MyLib-1\.0\.0-win64\.msi generated\. ]*/Tests/RunCMake/CPack_WIX/AppWiX-build/MyLib-1\.0\.0-(win64|windows-arm64)\.msi generated\.

2
Tests/RunCMake/CPack_WIX/AppWiX-verify-stdout.txt
View File

@ -1,4 +1,4 @@
-- MyLib-1\.0\.0-win64\.msi -- MyLib-1\.0\.0-(win64|windows-arm64)\.msi
Component: 'CM_CP_applications.bin.my_libapp.exe' 'CM_DP_applications.bin' Component: 'CM_CP_applications.bin.my_libapp.exe' 'CM_DP_applications.bin'
Component: 'CM_SHORTCUT_applications' 'PROGRAM_MENU_FOLDER' Component: 'CM_SHORTCUT_applications' 'PROGRAM_MENU_FOLDER'
Component: 'CM_SHORTCUT_DESKTOP_applications' 'DesktopFolder' Component: 'CM_SHORTCUT_DESKTOP_applications' 'DesktopFolder'

5
Tests/RunCMake/RunCPack/AppWiX/CMakeLists.txt
View File

@ -46,6 +46,11 @@ set(CPACK_PACKAGE_VERSION_MINOR "0")
set(CPACK_PACKAGE_VERSION_PATCH "0") set(CPACK_PACKAGE_VERSION_PATCH "0")
set(CPACK_PACKAGE_INSTALL_DIRECTORY "CPack Component Example") set(CPACK_PACKAGE_INSTALL_DIRECTORY "CPack Component Example")
if(CMAKE_CXX_COMPILER_ARCHITECTURE_ID STREQUAL "ARM64")
set(CPACK_WIX_ARCHITECTURE arm64)
set(CPACK_SYSTEM_NAME windows-arm64)
endif()
set(CPACK_WIX_UPGRADE_GUID "BF20CE5E-7F7C-401D-8F7C-AB45E8D170E6") set(CPACK_WIX_UPGRADE_GUID "BF20CE5E-7F7C-401D-8F7C-AB45E8D170E6")
set(CPACK_WIX_UNINSTALL "1") set(CPACK_WIX_UNINSTALL "1")