From 20e619af331f0a7e7632a351eb67c62e0209910a Mon Sep 17 00:00:00 2001
From: Aleix Pol <aleixpol@kde.org>
Date: Mon, 24 Sep 2018 12:55:30 +0200
Subject: Fix Android builds using cmake 3.12.1

Summary: Only extract the the stl shared object without the rest of libraries.

Test Plan: Built gcompris

Reviewers: #frameworks, vkrause

Reviewed By: vkrause

Subscribers: kde-frameworks-devel, kde-buildsystem

Tags: #frameworks, #build_system

Differential Revision: https://phabricator.kde.org/D15685
---
 toolchain/ECMAndroidDeployQt.cmake | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

(limited to 'toolchain/ECMAndroidDeployQt.cmake')

diff --git a/toolchain/ECMAndroidDeployQt.cmake b/toolchain/ECMAndroidDeployQt.cmake
index 53b7d626..66dbbd6e 100644
--- a/toolchain/ECMAndroidDeployQt.cmake
+++ b/toolchain/ECMAndroidDeployQt.cmake
@@ -38,7 +38,10 @@ function(ecm_androiddeployqt QTANDROID_EXPORTED_TARGET ECM_ADDITIONAL_FIND_ROOT_
 
     function(havestl var access VALUE)
         if (NOT VALUE STREQUAL "")
-            file(WRITE ${CMAKE_BINARY_DIR}/stl "${VALUE}")
+            string(FIND "${VALUE}" ".so\"" OUT)
+            math(EXPR OUT "${OUT}+4")
+            string(SUBSTRING "${VALUE}" 0 ${OUT} OUTSTR)
+            file(WRITE ${CMAKE_BINARY_DIR}/stl "${OUTSTR}")
         endif()
     endfunction()
     variable_watch(CMAKE_CXX_STANDARD_LIBRARIES havestl)
-- 
cgit v1.2.1