From c6ae4fa9008b0805f4358012040e67577ba31791 Mon Sep 17 00:00:00 2001
From: Andreas Cord-Landwehr <cordlandwehr@kde.org>
Date: Mon, 13 Jun 2016 18:27:24 +0200
Subject: Integrate relative library paths to APK

Needed for many unit tests to add them to APK files.

REVIEW: 128175
---
 toolchain/specifydependencies.cmake | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

(limited to 'toolchain/specifydependencies.cmake')

diff --git a/toolchain/specifydependencies.cmake b/toolchain/specifydependencies.cmake
index e01c61a7..65e875bf 100644
--- a/toolchain/specifydependencies.cmake
+++ b/toolchain/specifydependencies.cmake
@@ -2,13 +2,17 @@ file(READ "${TARGET_DIR}/CMakeFiles/${TARGET_NAME}.dir/link.txt" out)
 
 string(FIND "${out}" "-o ${TARGET_NAME}" POS) #we trim the initial arguments, we want the ones in the end. we find the target
 string(SUBSTRING "${out}" ${POS} -1 out) #we
-string(REGEX MATCHALL " /.+\\.so" outout "${out}")
+string(REGEX MATCHALL "(/|\\.\\./|\\./)[^ ]+\\.so" outout "${out}")
 string(STRIP "${outout}" outout)
 string(REPLACE " /" ";/" outout "${outout}")
 
 set(extralibs)
 foreach(lib IN LISTS outout) #now we filter Qt5 libraries, because Qt wants to take care about these itself
     if(NOT ${lib} MATCHES ".*/libQt5.*")
+        # resolve relative paths
+        if(${lib} MATCHES "^(\\.\\./|\\./)")
+            set(lib "${TARGET_DIR}/${lib}")
+        endif()
         if(extralibs)
             set(extralibs "${extralibs},${lib}")
         else()
-- 
cgit v1.2.1