From 9d48a95917698868cbcc12039c52a9f5bfbda212 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=D0=9F=D0=B5=D0=BB=D0=B8=D0=BF=D0=B5=D0=BD=D0=BA=D0=BE=20?=
 =?UTF-8?q?=D0=98=D0=B2=D0=B0=D0=BD?= <peri4ko@yandex.ru>
Date: Mon, 20 Apr 2020 21:54:14 +0000
Subject: [PATCH] git-svn-id: svn://db.shs.com.ru/pip@1062
 12ceb7fc-bf1f-11e4-8940-5bc7170c53b5

---
 cmake/DeployMacros.cmake | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

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)