From 123d0d14017a25fb387efd8fe3c2c1323f9c3815 Mon Sep 17 00:00:00 2001 From: Aleix Pol Date: Thu, 28 Jan 2016 12:06:57 +0100 Subject: Make sure the prefix is looked-up on Android The only reason why it used to work, is because all libraries we're including, provide *Config.cmake files, which don't respect this setting. REVIEW: 126896 --- toolchain/Android.cmake | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/toolchain/Android.cmake b/toolchain/Android.cmake index 81ded8f5..60bd058d 100644 --- a/toolchain/Android.cmake +++ b/toolchain/Android.cmake @@ -149,8 +149,8 @@ set(CMAKE_CXX_COMPILER "${ANDROID_TOOLCHAIN_ROOT}/${ANDROID_TOOLCHAIN}-g++") SET(CMAKE_FIND_ROOT_PATH ${ANDROID_NDK}) SET(CMAKE_FIND_ROOT_PATH_MODE_PROGRAM NEVER) -SET(CMAKE_FIND_ROOT_PATH_MODE_LIBRARY ONLY) -SET(CMAKE_FIND_ROOT_PATH_MODE_INCLUDE ONLY) +SET(CMAKE_FIND_ROOT_PATH_MODE_LIBRARY BOTH) +SET(CMAKE_FIND_ROOT_PATH_MODE_INCLUDE BOTH) set(CMAKE_EXE_LINKER_FLAGS "${GNUSTL_SHARED} -Wl,-rpath-link,${ANDROID_LIBRARIES_PATH} -llog -lz -lm -ldl -lc -lgcc" CACHE STRING "") set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS}" CACHE STRING "") -- cgit v1.2.1