From 696d16ae6c5214e314cfc7cb809c2e574bcff651 Mon Sep 17 00:00:00 2001

From: Brad King <brad.king@kitware.com>

Date: Fri, 25 Sep 2020 12:04:34 -0400

Subject: [PATCH] FindJNI: Add aarch64 support

Extend the fix from commit 44dffbcc94 (FindJNI: Add arm64 support,

2020-08-25, v3.18.3~21^2) to cover the `aarch64` name too.

Fixes: #21237

---

 Modules/FindJNI.cmake | 2 +-

 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Modules/FindJNI.cmake b/Modules/FindJNI.cmake

index eff815ddc8..bbca952866 100644

--- a/Modules/FindJNI.cmake

+++ b/Modules/FindJNI.cmake

@@ -60,7 +60,7 @@ macro(java_append_library_directories _var)

     elseif(CMAKE_SYSTEM_PROCESSOR MATCHES "^i.86$")

         set(_java_libarch "i386")

     elseif(CMAKE_SYSTEM_PROCESSOR MATCHES "^aarch64")

-        set(_java_libarch "arm64")

+        set(_java_libarch "arm64" "aarch64")

     elseif(CMAKE_SYSTEM_PROCESSOR MATCHES "^alpha")

         set(_java_libarch "alpha")

     elseif(CMAKE_SYSTEM_PROCESSOR MATCHES "^arm")

-- 

GitLab