From bd24f450f81e811948cbad9ffc32fd4734460d72 Mon Sep 17 00:00:00 2001 From: Biswapriyo Nath Date: Mon, 13 Feb 2023 09:57:02 +0530 Subject: [PATCH] CMake: Allow arm64 architecure in Windows This also sets arm64 as processor architecture in exe manifest files. --- CMakeLists.txt | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/CMakeLists.txt b/CMakeLists.txt index 1149fcb3e9..8a54184f1c 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -132,6 +132,8 @@ if(WIN32) set(WIRESHARK_TARGET_PLATFORM win64) elseif($ENV{MSYSTEM_CARCH} MATCHES "i686") set(WIRESHARK_TARGET_PLATFORM win32) + elseif($ENV{MSYSTEM_CARCH} MATCHES "aarch64") + set(WIRESHARK_TARGET_PLATFORM "win64arm") else() set(WIRESHARK_TARGET_PLATFORM "$ENV{MSYSTEM_CARCH}") endif() @@ -149,6 +151,8 @@ if(WIN32) elseif(WIRESHARK_TARGET_PLATFORM MATCHES "win32") message(FATAL_ERROR "Deprecated target platform ${WIRESHARK_TARGET_PLATFORM}. See https://gitlab.com/wireshark/wireshark/-/issues/17779 for details.") set(WIRESHARK_TARGET_PROCESSOR_ARCHITECTURE x86) + elseif(WIRESHARK_TARGET_PLATFORM MATCHES "win64arm") + set(WIRESHARK_TARGET_PROCESSOR_ARCHITECTURE arm64) else() message(FATAL_ERROR "Invalid target platform: ${WIRESHARK_TARGET_PLATFORM}") endif()