summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBrad King <brad.king@kitware.com>2020-09-28 12:38:47 (GMT)
committerKitware Robot <kwrobot@kitware.com>2020-09-28 12:38:54 (GMT)
commitc47293fe9fdbef19bd0294365006d221cb62b049 (patch)
tree2ac5d21e42b811985af1a33d6e98c5ec4e2b4b13
parent97626b1dec6e1047550392dc36defafede41fd75 (diff)
parent696d16ae6c5214e314cfc7cb809c2e574bcff651 (diff)
downloadCMake-c47293fe9fdbef19bd0294365006d221cb62b049.zip
CMake-c47293fe9fdbef19bd0294365006d221cb62b049.tar.gz
CMake-c47293fe9fdbef19bd0294365006d221cb62b049.tar.bz2
Merge topic 'FindJNI-aarch64'
696d16ae6c FindJNI: Add aarch64 support Acked-by: Kitware Robot <kwrobot@kitware.com> Acked-by: Vitaly Lipatov <lav@etersoft.ru> Merge-request: !5275
-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")