diff options
| author | Brad King <brad.king@kitware.com> | 2023-02-07 14:32:05 +0000 |
|---|---|---|
| committer | Kitware Robot <kwrobot@kitware.com> | 2023-02-07 09:32:20 -0500 |
| commit | 60911f4ebc417d51239100b519490399d7c8172d (patch) | |
| tree | 1badc6b021b085ba1b662689c437a7d7cd3bc0a2 /Modules/Platform | |
| parent | d2be571ae2299212c531f0bec0f0948a2aa2956f (diff) | |
| parent | cb0b9452e8c9a47ddfa29cfa0bd7e5e21ea2c389 (diff) | |
| download | cmake-60911f4ebc417d51239100b519490399d7c8172d.tar.gz | |
Merge topic 'android-ndk-legacy-toolchain'
cb0b9452e8 Android: Provide CMAKE_ANDROID_NDK_VERSION with NDK legacy toolchain file
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !8170
Diffstat (limited to 'Modules/Platform')
| -rw-r--r-- | Modules/Platform/Android.cmake | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/Modules/Platform/Android.cmake b/Modules/Platform/Android.cmake index d0f686cb03..05309883cd 100644 --- a/Modules/Platform/Android.cmake +++ b/Modules/Platform/Android.cmake @@ -39,6 +39,8 @@ endif() # Commonly used Android toolchain files that pre-date CMake upstream support # set CMAKE_SYSTEM_VERSION to 1. Avoid interfering with them. if(CMAKE_SYSTEM_VERSION EQUAL 1) + # The NDK legacy toolchain file provides its version number. + set(CMAKE_ANDROID_NDK_VERSION ${ANDROID_NDK_MAJOR}.${ANDROID_NDK_MINOR}) return() endif() |