diff options
author | Brad King <brad.king@kitware.com> | 2022-10-17 15:53:41 -0400 |
---|---|---|
committer | Brad King <brad.king@kitware.com> | 2022-10-17 15:53:41 -0400 |
commit | 9fefa9ef49061c7fc572bb21e37a2349d716a860 (patch) | |
tree | f91c2af0b40af140874ef12790ea2979c5686280 | |
parent | 06294a1945110d7d7d0e3c39401c606f8edf95c9 (diff) | |
parent | c833df092406874c84dce94c708fe90272701379 (diff) | |
download | cmake-9fefa9ef49061c7fc572bb21e37a2349d716a860.tar.gz |
Merge branch 'FindJNI-android-api' into release-3.24
Merge-request: !7801
-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 e93b91e2b1..64163b008a 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. |