diff --git a/cmake/DeployMacros.cmake b/cmake/DeployMacros.cmake index e3797458..08986fb7 100644 --- a/cmake/DeployMacros.cmake +++ b/cmake/DeployMacros.cmake @@ -837,10 +837,14 @@ macro(deploy_target _T) string(REPLACE "\nandroid {" "\nandroid {\n${__gradle_sign}" _file "${_file}") string(REPLACE "['resources']" "['res']" _file "${_file}") file(WRITE "${_AGD}/build.gradle" "${_file}") + set(_gradle_home) + if (CMAKE_CROSSCOMPILING) + set(_gradle_home "-g" "${CMAKE_BINARY_DIR}") + endif() #set(_CMD_ ${_CMD_} COMMAND "${SDK_ROOT}/tools/android" update project --path "\"${_AGD}\"" --target android-${ANDROID_TARGET_SDK} --name QtApp) set(_CMD_ ${_CMD_} COMMAND "${Qt5_BIN}/androiddeployqt" --aux-mode --android-platform ${ANDROID_PLATFORM} --output "\"${_AGD}\"" --input "\"${_out_json}\"") - set(_CMD_ ${_CMD_} COMMAND "${_AGD}/gradlew" --no-daemon -p "\"${_AGD}\"" assembleDebug) - set(_CMD_ ${_CMD_} COMMAND "${_AGD}/gradlew" --no-daemon -p "\"${_AGD}\"" bundleRelease) + set(_CMD_ ${_CMD_} COMMAND "${_AGD}/gradlew" ${_gradle_home} --no-daemon -p "\"${_AGD}\"" assembleDebug) + set(_CMD_ ${_CMD_} COMMAND "${_AGD}/gradlew" ${_gradle_home} --no-daemon -p "\"${_AGD}\"" bundleRelease) set(_dir) set(_file "${_AGD}/build/outputs/apk/debug/${_T}.android-debug.apk") if (ANDROID_STORE_FILE)