diff options
| author | Aleix Pol <aleixpol@kde.org> | 2018-09-24 12:55:30 +0200 |
|---|---|---|
| committer | Aleix Pol <aleixpol@kde.org> | 2018-09-24 12:56:47 +0200 |
| commit | 20e619af331f0a7e7632a351eb67c62e0209910a (patch) | |
| tree | 93fae436f71ba4ab17831614a0cd586edddd2437 | |
| parent | 9b528012703ae584e80a4954df153091a1443be9 (diff) | |
| download | extra-cmake-modules-20e619af331f0a7e7632a351eb67c62e0209910a.tar.gz extra-cmake-modules-20e619af331f0a7e7632a351eb67c62e0209910a.tar.bz2 | |
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
| -rw-r--r-- | toolchain/ECMAndroidDeployQt.cmake | 5 |
1 files changed, 4 insertions, 1 deletions
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) |