diff options
| author | Brad King <brad.king@kitware.com> | 2021-08-19 14:23:19 (GMT) |
|---|---|---|
| committer | Kitware Robot <kwrobot@kitware.com> | 2021-08-19 14:23:31 (GMT) |
| commit | 7f6905630f65308fb4a9853a81756aaf0c9f1e08 (patch) | |
| tree | dce003ffbfc0a84ab42a9953681aff00aac61e5d | |
| parent | 3de5096094b440b75887467a79e04eaafb2ba236 (diff) | |
| parent | 164643fc3994f7fca09d4974cb097ec3d418cd53 (diff) | |
| download | CMake-7f6905630f65308fb4a9853a81756aaf0c9f1e08.zip CMake-7f6905630f65308fb4a9853a81756aaf0c9f1e08.tar.gz CMake-7f6905630f65308fb4a9853a81756aaf0c9f1e08.tar.bz2 | |
Merge topic 'android-macos-arm64' into release-3.21
164643fc39 Android: Fix NDK toolchain dir on arm64 mac
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !6449
| -rw-r--r-- | Modules/Platform/Android-Determine.cmake | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Modules/Platform/Android-Determine.cmake b/Modules/Platform/Android-Determine.cmake index 2d2cd5c..7b67f83 100644 --- a/Modules/Platform/Android-Determine.cmake +++ b/Modules/Platform/Android-Determine.cmake @@ -267,7 +267,7 @@ endif() if(CMAKE_ANDROID_NDK) # Identify the host platform. if(CMAKE_HOST_SYSTEM_NAME STREQUAL "Darwin") - if(CMAKE_HOST_SYSTEM_PROCESSOR STREQUAL "x86_64") + if(CMAKE_HOST_SYSTEM_PROCESSOR MATCHES "64") set(CMAKE_ANDROID_NDK_TOOLCHAIN_HOST_TAG "darwin-x86_64") else() set(CMAKE_ANDROID_NDK_TOOLCHAIN_HOST_TAG "darwin-x86") |