SHS/pip
4
3
Fork 0
Code Issues 67 Pull Requests 1 Actions Releases Wiki Activity

Merge branch 'master' of https://git.shs.tools/SHS/pip

Browse Source
This commit is contained in:
Бычков Андрей
2020-04-29 18:41:47 +03:00
parent b24de48931 b9ba2d66b9
commit b9eda039a0
1 changed files with 14 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
cmake/DeployMacros.cmake
View File

@@ -508,9 +508,9 @@ set(__macos_privacies
<key>NSVideoSubscriberAccountUsageDescription</key> <key>NSVideoSubscriberAccountUsageDescription</key>
<string>${__macos_privacy_text}</string>" <string>${__macos_privacy_text}</string>"
) )
#defaultConfig { set(__gradle_lang_start
# resConfigs "ru" " defaultConfig {
#} resConfigs ")
set(__gradle_sign set(__gradle_sign
" signingConfigs { " signingConfigs {
debug { debug {
@@ -871,9 +871,19 @@ macro(deploy_target _T)
foreach (_d ${ANDROID_GRADLE_DEPENDENCIES}) foreach (_d ${ANDROID_GRADLE_DEPENDENCIES})
set(_depstr "${_depstr}\n ${_d}") set(_depstr "${_depstr}\n ${_d}")
endforeach() endforeach()
set(__gradle_lang)
foreach (_l ${${_T}_LANG})
if (NOT "x${__gradle_lang}" STREQUAL "x")
set(__gradle_lang "${__gradle_lang}, ")
endif()
set(__gradle_lang "${__gradle_lang}\"${_l}\"")
endforeach()
if ("x${__gradle_lang}" STREQUAL "x")
set(__gradle_lang "\"en\"")
endif()
file(READ "${Qt5_ROOT}/src/android/templates/build.gradle" _file) file(READ "${Qt5_ROOT}/src/android/templates/build.gradle" _file)
string(REPLACE "\ndependencies {" "\ndependencies {${_depstr}" _file "${_file}") string(REPLACE "\ndependencies {" "\ndependencies {${_depstr}" _file "${_file}")
string(REPLACE "\nandroid {" "\nandroid {\n${__gradle_sign}" _file "${_file}") string(REPLACE "\nandroid {" "\nandroid {\n${__gradle_sign}\n${__gradle_lang_start}${__gradle_lang}\n\t}\n" _file "${_file}")
string(REPLACE "['resources']" "['res']" _file "${_file}") string(REPLACE "['resources']" "['res']" _file "${_file}")
file(WRITE "${_AGD}/build.gradle" "${_file}") file(WRITE "${_AGD}/build.gradle" "${_file}")
set(_gradle_home) set(_gradle_home)