From 73a0265c6272df44d58ec14809b5c04a37e1219c Mon Sep 17 00:00:00 2001
From: Volker Krause <vkrause@kde.org>
Date: Sat, 17 Mar 2018 10:57:46 +0100
Subject: Provide androiddeployqt with all prefix paths

Summary:
This is needed for a new feature in Qt 5.12, making androiddepolyqt's
recursive dependency resolution avaiable for components installed in
different prefixes too.

This will allow us to drop our own partial ELF dependency parsing code
eventually, as well as avoid having to do workarounds like linking against
all indirect dependencies.

Reviewers: #build_system, apol

Reviewed By: apol

Subscribers: #frameworks

Tags: #frameworks, #build_system

Differential Revision: https://phabricator.kde.org/D11388
---
 toolchain/Android.cmake | 8 ++++++++
 1 file changed, 8 insertions(+)

(limited to 'toolchain/Android.cmake')

diff --git a/toolchain/Android.cmake b/toolchain/Android.cmake
index f0d6ea71..df9d9b0e 100644
--- a/toolchain/Android.cmake
+++ b/toolchain/Android.cmake
@@ -251,6 +251,14 @@ if(DEFINED QTANDROID_EXPORTED_TARGET AND NOT TARGET ${CREATEAPK_TARGET_NAME})
             endif()
         endif()
     endforeach()
+    set(EXTRA_PREFIX_DIRS "")
+    foreach(prefix ${ECM_ADDITIONAL_FIND_ROOT_PATH})
+        if (EXTRA_PREFIX_DIRS)
+            set(EXTRA_PREFIX_DIRS "${EXTRA_PREFIX_DIRS}, \"${prefix}\"")
+        else()
+            set(EXTRA_PREFIX_DIRS "\"${prefix}\"")
+        endif()
+    endforeach()
     configure_file("${_CMAKE_ANDROID_DIR}/deployment-file.json.in" "${QTANDROID_EXPORTED_TARGET}-deployment.json.in")
 
     if (CMAKE_GENERATOR STREQUAL "Unix Makefiles")
-- 
cgit v1.2.1