diff options
| author | Brad King <brad.king@kitware.com> | 2020-09-28 12:38:47 (GMT) |
|---|---|---|
| committer | Kitware Robot <kwrobot@kitware.com> | 2020-09-28 12:38:54 (GMT) |
| commit | 99f92d55d62d5cf06bcaca40cc1673b47ac1284f (patch) | |
| tree | 49fd0249e47751ebc0be488ccad0013ff33de767 | |
| parent | c6c90b42074aeea029c6a06c799ad284f4371a7d (diff) | |
| parent | 696d16ae6c5214e314cfc7cb809c2e574bcff651 (diff) | |
| download | CMake-99f92d55d62d5cf06bcaca40cc1673b47ac1284f.zip CMake-99f92d55d62d5cf06bcaca40cc1673b47ac1284f.tar.gz CMake-99f92d55d62d5cf06bcaca40cc1673b47ac1284f.tar.bz2 | |
Merge topic 'FindJNI-aarch64' into release-3.18
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.cmake | 2 |
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") |