diff options
| author | Albert Astals Cid <aacid@kde.org> | 2017-08-02 20:41:22 +0200 |
|---|---|---|
| committer | Albert Astals Cid <aacid@kde.org> | 2017-08-02 20:41:22 +0200 |
| commit | 165465ee7116bbbd8c0dd2ae04c2037c45f208a8 (patch) | |
| tree | e0b4b828e1087000f66e9d0e9063b6890b324c07 | |
| parent | b4f37c8fe172a9eba7e950eb7c74e90e17939afe (diff) | |
| download | extra-cmake-modules-5.37.0-rc1.tar.gz extra-cmake-modules-5.37.0-rc1.tar.bz2 | |
Add --gradle to androiddeployqtv5.37.0-rc1v5.37.0
Otherwise when trying to build with the newest Qt/android toolchains it
fails
Differential Revision: https://phabricator.kde.org/D6875
| -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 a1f647ed..201880fd 100644 --- a/toolchain/Android.cmake +++ b/toolchain/Android.cmake @@ -243,7 +243,7 @@ if(DEFINED QTANDROID_EXPORTED_TARGET AND NOT TARGET ${CREATEAPK_TARGET_NAME}) COMMAND cmake -E copy_directory "${ANDROID_APK_DIR}" "${EXPORT_DIR}" COMMAND cmake -E copy "$<TARGET_FILE:${QTANDROID_EXPORTED_TARGET}>" "${EXECUTABLE_DESTINATION_PATH}" COMMAND cmake -DINPUT_FILE="${QTANDROID_EXPORTED_TARGET}-deployment.json.in" -DOUTPUT_FILE="${QTANDROID_EXPORTED_TARGET}-deployment.json" "-DTARGET_DIR=$<TARGET_FILE_DIR:${QTANDROID_EXPORTED_TARGET}>" "-DTARGET_NAME=${QTANDROID_EXPORTED_TARGET}" "-DEXPORT_DIR=${CMAKE_INSTALL_PREFIX}" -P ${_CMAKE_ANDROID_DIR}/specifydependencies.cmake - COMMAND $<TARGET_FILE_DIR:Qt5::qmake>/androiddeployqt --input "${QTANDROID_EXPORTED_TARGET}-deployment.json" --output "${EXPORT_DIR}" --deployment bundled "\\$(ARGS)" + COMMAND $<TARGET_FILE_DIR:Qt5::qmake>/androiddeployqt --gradle --input "${QTANDROID_EXPORTED_TARGET}-deployment.json" --output "${EXPORT_DIR}" --deployment bundled "\\$(ARGS)" ) add_custom_target(install-apk-${QTANDROID_EXPORTED_TARGET} |