cmake: fix Android toolchain missing usage of CMAKE_PREFIX_PATH

This commit is contained in:
Marc-André Moreau 2016-07-19 21:53:23 -04:00
parent 05d63c6874
commit a04f3242a1

View File

@ -1511,7 +1511,7 @@ set( ANDROID True )
set( BUILD_ANDROID True ) set( BUILD_ANDROID True )
# where is the target environment # 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}" "${CMAKE_INSTALL_PREFIX}" "${CMAKE_INSTALL_PREFIX}/share" "${CMAKE_PREFIX_PATH}" )
# only search for libraries and includes in the ndk toolchain # only search for libraries and includes in the ndk toolchain
set( CMAKE_FIND_ROOT_PATH_MODE_PROGRAM ONLY ) set( CMAKE_FIND_ROOT_PATH_MODE_PROGRAM ONLY )