summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBrad King <brad.king@kitware.com>2020-09-25 16:04:34 (GMT)
committerBrad King <brad.king@kitware.com>2020-09-25 16:04:34 (GMT)
commit696d16ae6c5214e314cfc7cb809c2e574bcff651 (patch)
tree90ad65ec554faeaf16514ec5b10173cdadb9e912
parent177fc020731bcee747295573c92cd0f7ca200e53 (diff)
downloadCMake-696d16ae6c5214e314cfc7cb809c2e574bcff651.zip
CMake-696d16ae6c5214e314cfc7cb809c2e574bcff651.tar.gz
CMake-696d16ae6c5214e314cfc7cb809c2e574bcff651.tar.bz2
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
-rw-r--r--Modules/FindJNI.cmake2
1 files changed, 1 insertions, 1 deletions
diff --git a/Modules/FindJNI.cmake b/Modules/FindJNI.cmake
index eff815d..bbca952 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")