Review Request 127700: Android deployment: support projects without things in share or lib/qml

[Friedrich W. H. Kossebau]

-----------------------------------------------------------
This is an automatically generated e-mail. To reply, visit:
https://git.reviewboard.kde.org/r/127700/
-----------------------------------------------------------

(Updated May 3, 2016, 8 a.m.)


Status
------

This change has been marked as submitted.


Review request for Extra Cmake Modules and Aleix Pol Gonzalez.


Changes
-------

Submitted with commit e0cfec7848ba63190957e107c7ef32dbe0119c42 by Friedrich W. H. Kossebau to branch master.


Repository: extra-cmake-modules


Description
-------

Not all projects install something to ${CMAKE_INSTALL_PREFIX}/share or ${CMAKE_INSTALL_PREFIX}/lib/qml (e.g. when using qrc files). Currently this results in androiddeployqt (some 5.5 at least) to fail with the deployment file generated by the ECM toolchain file. Because both dirs are hardcoded into the deployment file.

This patch tries to fix that by only adding those dirs which exist in the install folder.

Just setting the field android-extra-plugins to an empty string resulted
in androiddeployqt complaining about
    "External resource  does not exist or not a correct directory!"
so the field is completely left out now if no plugin data dirs are found.
So I instead propose to insert the complete field only if there is content.
For consistency the same is done with the android-extra-libs field.


Diffs
-----

  toolchain/Android.cmake 60bd058 
  toolchain/deployment-file.json.in 9367bc1 
  toolchain/specifydependencies.cmake 21b169a 

Diff: https://git.reviewboard.kde.org/r/127700/diff/


Testing
-------

Works fine with kirigamigallery and hellokandroid.


Thanks,

Friedrich W. H. Kossebau

-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://mail.kde.org/pipermail/kde-buildsystem/attachments/20160503/12d52fad/attachment.html>