D15643: Android: Allow passing a relative path as the apk dir
This revision was automatically updated to reflect the committed changes. Closed by commit R240:453ba4fee312: Android: Allow passing a relative path as the apk dir (authored by apol). REPOSITORY R240 Extra CMake Modules CHANGES SINCE LAST UPDATE https://phabricator.kde.org/D15643?vs=42483=42531 REVISION DETAIL https://phabricator.kde.org/D15643 AFFECTED FILES toolchain/Android.cmake To: apol, #frameworks, #gcompris, jjazeix Cc: jjazeix, kde-frameworks-devel, kde-buildsystem, michaelh, ngraham, bruns
D15643: Android: Allow passing a relative path as the apk dir
jjazeix accepted this revision. jjazeix added a comment. This revision is now accepted and ready to land. works fine, sorry for the doubt, I probably badly applied it last time. REPOSITORY R240 Extra CMake Modules BRANCH arcpatch-D15643 REVISION DETAIL https://phabricator.kde.org/D15643 To: apol, #frameworks, #gcompris, jjazeix Cc: jjazeix, kde-frameworks-devel, kde-buildsystem, michaelh, ngraham, bruns
D15643: Android: Allow passing a relative path as the apk dir
apol updated this revision to Diff 42483. apol added a comment. Rebased REPOSITORY R240 Extra CMake Modules CHANGES SINCE LAST UPDATE https://phabricator.kde.org/D15643?vs=42046=42483 BRANCH arcpatch-D15643 REVISION DETAIL https://phabricator.kde.org/D15643 AFFECTED FILES toolchain/Android.cmake To: apol, #frameworks, #gcompris Cc: jjazeix, kde-frameworks-devel, kde-buildsystem, michaelh, ngraham, bruns
D15643: Android: Allow passing a relative path as the apk dir
apol added a comment. Are you sure you applied the patch properly? You are getting the warning that we are guarding against. REPOSITORY R240 Extra CMake Modules REVISION DETAIL https://phabricator.kde.org/D15643 To: apol, #frameworks, #gcompris Cc: jjazeix, kde-frameworks-devel, kde-buildsystem, michaelh, ngraham, bruns
D15643: Android: Allow passing a relative path as the apk dir
jjazeix added a comment. Unfortunately, this does not work. The tmpAndroid folder is created in the build folder after running cmake, so it's not available before: Cannot find tmpAndroid//AndroidManifest.xml according to ANDROID_APK_DIR. tmpAndroid/ GCompris Call Stack (most recent call first): /opt/cmake/share/cmake-3.11/Modules/CMakeDetermineSystem.cmake:94 (include) CMakeLists.txt:4 (project) REPOSITORY R240 Extra CMake Modules REVISION DETAIL https://phabricator.kde.org/D15643 To: apol, #frameworks, #gcompris Cc: jjazeix, kde-frameworks-devel, kde-buildsystem, michaelh, ngraham, bruns
D15643: Android: Allow passing a relative path as the apk dir
jjazeix added a comment. Seems good to me at first sight, I'll try it as soon as possible REPOSITORY R240 Extra CMake Modules REVISION DETAIL https://phabricator.kde.org/D15643 To: apol, #frameworks, #gcompris Cc: jjazeix, kde-frameworks-devel, kde-buildsystem, michaelh, ngraham, bruns
D15643: Android: Allow passing a relative path as the apk dir
apol created this revision. apol added reviewers: Frameworks, GCompris. Herald added projects: Frameworks, Build System. Herald added subscribers: kde-buildsystem, kde-frameworks-devel. apol requested review of this revision. REVISION 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 REPOSITORY R240 Extra CMake Modules BRANCH master REVISION DETAIL https://phabricator.kde.org/D15643 AFFECTED FILES toolchain/Android.cmake To: apol, #frameworks, #gcompris Cc: kde-frameworks-devel, kde-buildsystem, michaelh, ngraham, bruns