diff options
| author | Volker Krause <vkrause@kde.org> | 2018-03-09 15:33:46 +0100 |
|---|---|---|
| committer | Volker Krause <vkrause@kde.org> | 2018-03-09 15:40:56 +0100 |
| commit | 553be332f2e33a292a1392b4db8fa1b7a6790386 (patch) | |
| tree | 473f8065130d40ab91badbe19797dfb0ae175748 /toolchain/Android.cmake | |
| parent | 61fd316e93f8270e7e0ff22cfa7cd668856085fb (diff) | |
| download | extra-cmake-modules-553be332f2e33a292a1392b4db8fa1b7a6790386.tar.gz extra-cmake-modules-553be332f2e33a292a1392b4db8fa1b7a6790386.tar.bz2 | |
Provide QML import paths to androiddeployqt
Summary:
This makes the qmlimportscanner find our QML files and plugins correctly.
That's IMHO much cleaner than the full copy of everything in the lib/qml
folder we do via the android-extra-plugins list.
Reviewers: #build_system, apol
Reviewed By: apol
Subscribers: #frameworks
Tags: #frameworks, #build_system
Differential Revision: https://phabricator.kde.org/D11177
Diffstat (limited to 'toolchain/Android.cmake')
| -rw-r--r-- | toolchain/Android.cmake | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/toolchain/Android.cmake b/toolchain/Android.cmake index 4590539e..a8e3c96e 100644 --- a/toolchain/Android.cmake +++ b/toolchain/Android.cmake @@ -239,6 +239,16 @@ if(DEFINED QTANDROID_EXPORTED_TARGET AND NOT TARGET ${CREATEAPK_TARGET_NAME}) set(EXPORT_DIR "${CMAKE_BINARY_DIR}/${QTANDROID_EXPORTED_TARGET}_build_apk/") set(EXECUTABLE_DESTINATION_PATH "${EXPORT_DIR}/libs/${ANDROID_ABI}/lib${QTANDROID_EXPORTED_TARGET}.so") + set(QML_IMPORT_PATHS "") + foreach(prefix ${ECM_ADDITIONAL_FIND_ROOT_PATH}) + if(EXISTS "${prefix}/lib/qml") + if (QML_IMPORT_PATHS) + set(QML_IMPORT_PATHS "${QML_IMPORT_PATHS},${prefix}/lib/qml") + else() + set(QML_IMPORT_PATHS "${prefix}/lib/qml") + endif() + endif() + endforeach() configure_file("${_CMAKE_ANDROID_DIR}/deployment-file.json.in" "${QTANDROID_EXPORTED_TARGET}-deployment.json.in") if (CMAKE_GENERATOR STREQUAL "Unix Makefiles") |