cmake: add ARM64 build support in Common.cmake

Author: hangzqcom

src/libraries/qcommon-console/Common.cmake

@@ -15,7 +15,12 @@ if(WIN32)
 endif()
 
 if(UNIX)
-    list(APPEND QCOMMONCONSOLE_DEFINITIONS __X86_64__)
+    # Detect architecture for Linux builds
+    if(CMAKE_SYSTEM_PROCESSOR MATCHES "aarch64|arm64|ARM64")
+        list(APPEND QCOMMONCONSOLE_DEFINITIONS __AARCH64__)
+    else()
+        list(APPEND QCOMMONCONSOLE_DEFINITIONS __X86_64__)
+    endif()
     set(QCOMMONCONSOLE_CXX_FLAGS
         -Werror
         -Wno-unused-result
@@ -40,29 +45,49 @@ if(UNIX)
     )
 endif()
 
-if(CMAKE_BUILD_TYPE STREQUAL "Debug")
-    list(APPEND QCOMMONCONSOLE_DEFINITIONS _DEBUG DEBUG)
-    if(WIN32)
-        set(CONFIGURATION "x64/Debug")
+# Determine architecture label for output directory
+if(WIN32)
+    if(CMAKE_GENERATOR_PLATFORM STREQUAL "ARM64" OR CMAKE_SYSTEM_PROCESSOR MATCHES "ARM64|aarch64")
+        set(_QEPM_ARCH "ARM64")
     else()
-        set(CONFIGURATION "Linux/Debug")
+        set(_QEPM_ARCH "x64")
     endif()
-else()
-    list(APPEND QCOMMONCONSOLE_DEFINITIONS _NDEBUG NDEBUG)
-    if(WIN32)
-        set(CONFIGURATION "x64/Release")
+elseif(UNIX)
+    if(CMAKE_SYSTEM_PROCESSOR MATCHES "aarch64|arm64|ARM64")
+        set(_QEPM_ARCH "Linux-ARM64")
     else()
-        set(CONFIGURATION "Linux/Release")
+        set(_QEPM_ARCH "Linux")
     endif()
 endif()
 
+if(CMAKE_BUILD_TYPE STREQUAL "Debug")
+    list(APPEND QCOMMONCONSOLE_DEFINITIONS _DEBUG DEBUG)
+    set(CONFIGURATION "${_QEPM_ARCH}/Debug")
+else()
+    list(APPEND QCOMMONCONSOLE_DEFINITIONS _NDEBUG NDEBUG)
+    set(CONFIGURATION "${_QEPM_ARCH}/Release")
+endif()
+
 set(BUILDROOT ${CMAKE_SOURCE_DIR}/__Builds/${CONFIGURATION})
 set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${BUILDROOT}/bin)
 set(CMAKE_LIBRARY_OUTPUT_DIRECTORY ${BUILDROOT}/lib)
 set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY ${BUILDROOT}/lib)
 
 if(WIN32)
-    find_program(WINDEPLOYQT_EXECUTABLE windeployqt HINTS "${Qt6_DIR}/../../../bin")
+    # For cross-compilation (e.g. ARM64 target on x64 host), windeployqt must
+    # come from the HOST Qt installation, not the target sysroot.
+    # QT_HOST_PATH is set by cmake when cross-compiling; fall back to Qt6_DIR.
+    if(DEFINED QT_HOST_PATH)
+        find_program(WINDEPLOYQT_EXECUTABLE windeployqt
+            HINTS "${QT_HOST_PATH}/bin"
+            NO_DEFAULT_PATH
+        )
+    endif()
+    if(NOT WINDEPLOYQT_EXECUTABLE)
+        find_program(WINDEPLOYQT_EXECUTABLE windeployqt
+            HINTS "${Qt6_DIR}/../../../bin"
+        )
+    endif()
     if(NOT WINDEPLOYQT_EXECUTABLE)
         set(WINDEPLOYQT_EXECUTABLE windeployqt)
     endif()
@@ -137,4 +162,4 @@ function(QCommonConsoleSettings target_name)
         target_link_options(${target_name} PRIVATE ${QCOMMONCONSOLE_LINK_FLAGS})
     endif()
     target_include_directories(${target_name} PRIVATE ${BUILDROOT}/ui/QCommon)
-endfunction()
+endfunction()