Commit 6c7ac258 authored by Sylvain Berfini's avatar Sylvain Berfini 🎩

Fixed Android build with NDK 20

parent 8ffb1441
...@@ -52,8 +52,12 @@ include("${CMAKE_ANDROID_NDK}/build/cmake/android.toolchain.cmake") ...@@ -52,8 +52,12 @@ include("${CMAKE_ANDROID_NDK}/build/cmake/android.toolchain.cmake")
if(CMAKE_ANDROID_NDK_VERSION VERSION_LESS 19) if(CMAKE_ANDROID_NDK_VERSION VERSION_LESS 19)
set(CMAKE_FIND_ROOT_PATH "${CMAKE_SYSROOT}" "${ANDROID_SYSTEM_LIBRARY_PATH}" "${CMAKE_INSTALL_PREFIX}") set(CMAKE_FIND_ROOT_PATH "${CMAKE_SYSROOT}" "${ANDROID_SYSTEM_LIBRARY_PATH}" "${CMAKE_INSTALL_PREFIX}")
else() else()
# NDK 19b needs this, but not NDK 19 if(CMAKE_ANDROID_NDK_VERSION VERSION_EQUAL 19)
if(CMAKE_ANDROID_NDK_VERSION_MINOR GREATER_EQUAL 1) # NDK 19b needs this, but not NDK 19
if(CMAKE_ANDROID_NDK_VERSION_MINOR GREATER_EQUAL 1)
set(CMAKE_FIND_ROOT_PATH "${CMAKE_SYSROOT}" "${ANDROID_SYSTEM_LIBRARY_PATH}" "${CMAKE_INSTALL_PREFIX}")
endif()
else()
set(CMAKE_FIND_ROOT_PATH "${CMAKE_SYSROOT}" "${ANDROID_SYSTEM_LIBRARY_PATH}" "${CMAKE_INSTALL_PREFIX}") set(CMAKE_FIND_ROOT_PATH "${CMAKE_SYSROOT}" "${ANDROID_SYSTEM_LIBRARY_PATH}" "${CMAKE_INSTALL_PREFIX}")
endif() endif()
endif() endif()
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment