diff options
| author | Aleix Pol <aleixpol@kde.org> | 2016-01-28 12:06:57 +0100 |
|---|---|---|
| committer | Aleix Pol <aleixpol@kde.org> | 2016-01-28 12:06:57 +0100 |
| commit | 123d0d14017a25fb387efd8fe3c2c1323f9c3815 (patch) | |
| tree | 47f7c8e33068a3b8282b7e757e97756d757a456a | |
| parent | f7a936b8fea2acfb564e785274526bec888106b6 (diff) | |
| download | extra-cmake-modules-123d0d14017a25fb387efd8fe3c2c1323f9c3815.tar.gz extra-cmake-modules-123d0d14017a25fb387efd8fe3c2c1323f9c3815.tar.bz2 | |
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
| -rw-r--r-- | toolchain/Android.cmake | 4 |
1 files 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 "") |