aboutsummaryrefslogtreecommitdiff
path: root/toolchain/Android.cmake
diff options
context:
space:
mode:
authorVolker Krause <vkrause@kde.org>2018-02-17 12:29:16 +0100
committerVolker Krause <vkrause@kde.org>2018-02-18 15:35:29 +0100
commit37c2eba2885591d0b3acf53b67493f6800c9d4c4 (patch)
treeb4dcecd5d061073cb6e81ca62e576fbef8d40859 /toolchain/Android.cmake
parent132b95190a31ef0b3256d8c43087c91bd785627f (diff)
downloadextra-cmake-modules-37c2eba2885591d0b3acf53b67493f6800c9d4c4.tar.gz
extra-cmake-modules-37c2eba2885591d0b3acf53b67493f6800c9d4c4.tar.bz2
Extend search path for NDK dependencies
Summary: This allows e.g. KArchive to find zlib correctly. Reviewers: #build_system, apol Reviewed By: apol Subscribers: #frameworks Tags: #frameworks, #build_system Differential Revision: https://phabricator.kde.org/D10601
Diffstat (limited to 'toolchain/Android.cmake')
-rw-r--r--toolchain/Android.cmake2
1 files changed, 1 insertions, 1 deletions
diff --git a/toolchain/Android.cmake b/toolchain/Android.cmake
index 010ea896..d482517b 100644
--- a/toolchain/Android.cmake
+++ b/toolchain/Android.cmake
@@ -168,7 +168,7 @@ SET(ANDROID TRUE)
if (NOT DEFINED ECM_ADDITIONAL_FIND_ROOT_PATH)
SET(ECM_ADDITIONAL_FIND_ROOT_PATH ${CMAKE_PREFIX_PATH})
endif()
-SET(CMAKE_FIND_ROOT_PATH ${ANDROID_NDK} ${ECM_ADDITIONAL_FIND_ROOT_PATH})
+SET(CMAKE_FIND_ROOT_PATH ${ANDROID_NDK} ${ANDROID_NDK}/sysroot ${CMAKE_SYSROOT} ${ECM_ADDITIONAL_FIND_ROOT_PATH})
SET(CMAKE_FIND_ROOT_PATH_MODE_PROGRAM NEVER)
set(CMAKE_FIND_ROOT_PATH_MODE_LIBRARY ONLY)
set(CMAKE_FIND_ROOT_PATH_MODE_INCLUDE ONLY)