diff options
| author | Brad King <brad.king@kitware.com> | 2020-08-26 14:25:45 (GMT) |
|---|---|---|
| committer | Kitware Robot <kwrobot@kitware.com> | 2020-08-26 14:26:52 (GMT) |
| commit | 807aaae4acf41d87b8eaf962d6a5f6f2cfe358c5 (patch) | |
| tree | 144d7cc636d55c4f0526215b08ac3a2f243a4820 /Modules | |
| parent | 57c1be6e1574bffed1e80390054fc193a3245732 (diff) | |
| parent | 44dffbcc94c5939cf4e81ab973a4a53ff706ecf3 (diff) | |
| download | CMake-807aaae4acf41d87b8eaf962d6a5f6f2cfe358c5.zip CMake-807aaae4acf41d87b8eaf962d6a5f6f2cfe358c5.tar.gz CMake-807aaae4acf41d87b8eaf962d6a5f6f2cfe358c5.tar.bz2 | |
Merge topic 'FindJNI-arm64' into release-3.18
44dffbcc94 FindJNI: Add arm64 support
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5162
Diffstat (limited to 'Modules')
| -rw-r--r-- | Modules/FindJNI.cmake | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/Modules/FindJNI.cmake b/Modules/FindJNI.cmake index 3a5bd31..eff815d 100644 --- a/Modules/FindJNI.cmake +++ b/Modules/FindJNI.cmake @@ -59,6 +59,8 @@ macro(java_append_library_directories _var) endif() elseif(CMAKE_SYSTEM_PROCESSOR MATCHES "^i.86$") set(_java_libarch "i386") + elseif(CMAKE_SYSTEM_PROCESSOR MATCHES "^aarch64") + set(_java_libarch "arm64") elseif(CMAKE_SYSTEM_PROCESSOR MATCHES "^alpha") set(_java_libarch "alpha") elseif(CMAKE_SYSTEM_PROCESSOR MATCHES "^arm") |