From 37c2eba2885591d0b3acf53b67493f6800c9d4c4 Mon Sep 17 00:00:00 2001
From: Volker Krause <vkrause@kde.org>
Date: Sat, 17 Feb 2018 12:29:16 +0100
Subject: 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
---
 toolchain/Android.cmake | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'toolchain/Android.cmake')

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)
-- 
cgit v1.2.1