From bc6a3553709113e228ee790a5dd7fb03753cb4f9 Mon Sep 17 00:00:00 2001 From: Alexander Alekhin Date: Thu, 4 Jan 2018 23:43:20 +0000 Subject: [PATCH] android(toolchain): fix find_path() behavior (zlib search problem) --- platforms/android/android.toolchain.cmake | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/platforms/android/android.toolchain.cmake b/platforms/android/android.toolchain.cmake index 9f9679e..4ac7102 100644 --- a/platforms/android/android.toolchain.cmake +++ b/platforms/android/android.toolchain.cmake @@ -1587,7 +1587,13 @@ set( ANDROID True ) set( BUILD_ANDROID True ) # where is the target environment -set( CMAKE_FIND_ROOT_PATH "${ANDROID_TOOLCHAIN_ROOT}/bin" "${ANDROID_TOOLCHAIN_ROOT}/${ANDROID_TOOLCHAIN_MACHINE_NAME}" "${ANDROID_SYSROOT}" "${CMAKE_INSTALL_PREFIX}" "${CMAKE_INSTALL_PREFIX}/share" ) +set( CMAKE_FIND_ROOT_PATH + "${ANDROID_TOOLCHAIN_ROOT}/bin" + "${ANDROID_TOOLCHAIN_ROOT}/${ANDROID_TOOLCHAIN_MACHINE_NAME}" + "${ANDROID_SYSROOT}" + "${ANDROID_NDK}/sysroot" # NDK16+ + "${CMAKE_INSTALL_PREFIX}" + "${CMAKE_INSTALL_PREFIX}/share" ) # only search for libraries and includes in the ndk toolchain set( CMAKE_FIND_ROOT_PATH_MODE_PROGRAM ONLY ) -- 2.7.4