From cd8b2988360d1ccd3dae0bf8564c0643321c6e09 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?= Date: Tue, 14 Apr 2020 18:47:59 +0000 Subject: [PATCH] git-svn-id: svn://db.shs.com.ru/pip@1014 12ceb7fc-bf1f-11e4-8940-5bc7170c53b5 --- cmake/DeployMacros.cmake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cmake/DeployMacros.cmake b/cmake/DeployMacros.cmake index 4ef3ebf6..41b632d0 100644 --- a/cmake/DeployMacros.cmake +++ b/cmake/DeployMacros.cmake @@ -737,6 +737,7 @@ macro(deploy_target _T) set(ANDROID_STORE_FILE "${CMAKE_CURRENT_SOURCE_DIR}/android/${ANDROID_STORE_FILE}") endif() set(QT_DIR ${Qt5_ROOT}) + set(_out_json "${CMAKE_CURRENT_BINARY_DIR}/${_T}_android_deployment_settings.json") configure_file("${CMAKE_BINARY_DIR}/android_deployment_settings.json.in" "${_out_json}") configure_file("${CMAKE_CURRENT_SOURCE_DIR}/android/AndroidManifest.xml.in" "${_AGD}/AndroidManifest.xml") configure_file("${CMAKE_ROOT}/Modules/gradle.properties.in" "${_AGD}/gradle.properties") @@ -749,7 +750,6 @@ 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(_out_json "${CMAKE_CURRENT_BINARY_DIR}/${_T}_android_deployment_settings.json") 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)