diff options
| author | Aleix Pol <aleixpol@kde.org> | 2018-09-28 15:50:31 +0200 |
|---|---|---|
| committer | Aleix Pol <aleixpol@kde.org> | 2018-09-29 02:38:32 +0200 |
| commit | 453ba4fee3126648e8ba4cadbef13207e02b1461 (patch) | |
| tree | ca9e7fcc850467511ca77018dccd7fefcad110b7 /toolchain | |
| parent | 88da70365026ec218e03f6bdaf9803bddd21878c (diff) | |
| download | extra-cmake-modules-453ba4fee3126648e8ba4cadbef13207e02b1461.tar.gz extra-cmake-modules-453ba4fee3126648e8ba4cadbef13207e02b1461.tar.bz2 | |
Android: Allow passing a relative path as the apk dir
Summary:
This way the project can generate automatically its own manifest file.
GCompris is using it to set the version.
Test Plan: Built GCompris without a warning saying the apkdir isn't found
Reviewers: #frameworks, #gcompris, jjazeix
Reviewed By: #gcompris, jjazeix
Subscribers: jjazeix, kde-frameworks-devel, kde-buildsystem
Tags: #frameworks, #build_system
Differential Revision: https://phabricator.kde.org/D15643
Diffstat (limited to 'toolchain')
| -rw-r--r-- | toolchain/Android.cmake | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/toolchain/Android.cmake b/toolchain/Android.cmake index d40463cd..74b1dbfc 100644 --- a/toolchain/Android.cmake +++ b/toolchain/Android.cmake @@ -203,7 +203,7 @@ if(DEFINED QTANDROID_EXPORTED_TARGET AND NOT TARGET "create-apk") foreach(idx RANGE 0 ${last}) list(GET QTANDROID_EXPORTED_TARGET ${idx} exportedTarget) list(GET ANDROID_APK_DIR ${idx} APK_DIR) - if(APK_DIR AND NOT EXISTS "${APK_DIR}/AndroidManifest.xml") + if(APK_DIR AND NOT EXISTS "${ANDROID_APK_DIR}/AndroidManifest.xml" AND IS_ABSOLUTE ANDROID_APK_DIR) message(FATAL_ERROR "Cannot find ${APK_DIR}/AndroidManifest.xml according to ANDROID_APK_DIR. ${ANDROID_APK_DIR} ${exportedTarget}") elseif(NOT APK_DIR) get_filename_component(_qt5Core_install_prefix "${Qt5Core_DIR}/../../../" ABSOLUTE) |