diff options
| author | Brad King <brad.king@kitware.com> | 2022-10-18 17:50:51 (GMT) |
|---|---|---|
| committer | Kitware Robot <kwrobot@kitware.com> | 2022-10-18 17:51:01 (GMT) |
| commit | dd32e58caed8b4b70acbeacf4408725b06ae8ca0 (patch) | |
| tree | 29f724a975dd5ea6ba21b8098705da8358610d11 /Modules | |
| parent | 65542be9700c47dd8c267f9ca8831f91d73640ff (diff) | |
| parent | c833df092406874c84dce94c708fe90272701379 (diff) | |
| download | CMake-dd32e58caed8b4b70acbeacf4408725b06ae8ca0.zip CMake-dd32e58caed8b4b70acbeacf4408725b06ae8ca0.tar.gz CMake-dd32e58caed8b4b70acbeacf4408725b06ae8ca0.tar.bz2 | |
Merge topic 'FindJNI-android-api' into release-3.25
c833df0924 FindJNI: replace CMAKE_ANDROID_API by CMAKE_SYSTEM_VERSION
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !7801
Diffstat (limited to 'Modules')
| -rw-r--r-- | Modules/FindJNI.cmake | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Modules/FindJNI.cmake b/Modules/FindJNI.cmake index e93b91e..64163b0 100644 --- a/Modules/FindJNI.cmake +++ b/Modules/FindJNI.cmake @@ -107,7 +107,7 @@ include(FindPackageHandleStandardArgs) if(NOT JNI_FIND_COMPONENTS) if(ANDROID) - if(CMAKE_ANDROID_API LESS 31) + if(CMAKE_SYSTEM_VERSION LESS 31) # There are no components for Android NDK set(JNI_FIND_COMPONENTS) else() @@ -125,7 +125,7 @@ else() # On Android, if JVM was requested we need to find NativeHelper as well which # is an implicit dependency of JVM allowing to provide uniform access to basic # JVM/DVM functionality. - if(ANDROID AND CMAKE_ANDROID_API GREATER_EQUAL 31 AND JVM IN_LIST JNI_FIND_COMPONENTS) + if(ANDROID AND CMAKE_SYSTEM_VERSION GREATER_EQUAL 31 AND JVM IN_LIST JNI_FIND_COMPONENTS) if(NOT NativeHelper IN_LIST JNI_FIND_COMPONENTS) list(APPEND JNI_FIND_COMPONENTS NativeHelper) # NativeHelper is required only if JVM was requested as such. |