From 406e207e74e4071700f23cd4675416c694134d80 Mon Sep 17 00:00:00 2001 From: Brad King Date: Mon, 18 Mar 2024 15:09:54 -0400 Subject: Tests: Teach RunCMake.CPack_WIX to honor windows-arm64 hosts --- Tests/RunCMake/CPack_WIX/AppWiX-cpack-WIX-stdout.txt | 2 +- Tests/RunCMake/CPack_WIX/AppWiX-verify-stdout.txt | 2 +- Tests/RunCMake/RunCPack/AppWiX/CMakeLists.txt | 5 +++++ 3 files changed, 7 insertions(+), 2 deletions(-) diff --git a/Tests/RunCMake/CPack_WIX/AppWiX-cpack-WIX-stdout.txt b/Tests/RunCMake/CPack_WIX/AppWiX-cpack-WIX-stdout.txt index 585166d..110b36e 100644 --- a/Tests/RunCMake/CPack_WIX/AppWiX-cpack-WIX-stdout.txt +++ b/Tests/RunCMake/CPack_WIX/AppWiX-cpack-WIX-stdout.txt @@ -8,4 +8,4 @@ CPack: - Install component: headers CPack: - Install component: libraries CPack: Create 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\. diff --git a/Tests/RunCMake/CPack_WIX/AppWiX-verify-stdout.txt b/Tests/RunCMake/CPack_WIX/AppWiX-verify-stdout.txt index 68f58ac..4713447 100644 --- a/Tests/RunCMake/CPack_WIX/AppWiX-verify-stdout.txt +++ b/Tests/RunCMake/CPack_WIX/AppWiX-verify-stdout.txt @@ -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_SHORTCUT_applications' 'PROGRAM_MENU_FOLDER' Component: 'CM_SHORTCUT_DESKTOP_applications' 'DesktopFolder' diff --git a/Tests/RunCMake/RunCPack/AppWiX/CMakeLists.txt b/Tests/RunCMake/RunCPack/AppWiX/CMakeLists.txt index 33fdc5e..affd4d4 100644 --- a/Tests/RunCMake/RunCPack/AppWiX/CMakeLists.txt +++ b/Tests/RunCMake/RunCPack/AppWiX/CMakeLists.txt @@ -46,6 +46,11 @@ set(CPACK_PACKAGE_VERSION_MINOR "0") set(CPACK_PACKAGE_VERSION_PATCH "0") 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_UNINSTALL "1") -- cgit v0.12