From 453ba4fee3126648e8ba4cadbef13207e02b1461 Mon Sep 17 00:00:00 2001 From: Aleix Pol Date: Fri, 28 Sep 2018 15:50:31 +0200 Subject: 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 --- toolchain/Android.cmake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'toolchain/Android.cmake') 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) -- cgit v1.2.1