QuasarApp/qt-android-cmake
4
0
Fork 0
mirror of https://github.com/QuasarApp/qt-android-cmake.git synced 2025-04-29 15:14:33 +00:00
Code Issues Projects Releases Wiki Activity

Added a BUILDTOOLS_REVISION option to set the Android SDK build-tools revision

Browse Source
This commit is contained in:
Laurent Gomila 2017-02-06 12:11:59 +01:00
parent 365a2946da
commit 035fbdf9c5
2 changed files with 9 additions and 1 deletions

9
AddQtAndroidApk.cmake

@ -77,7 +77,7 @@ include(CMakeParseArguments)
macro(add_qt_android_apk TARGET SOURCE_TARGET)
# parse the macro arguments
cmake_parse_arguments(ARG "INSTALL" "NAME;VERSION_CODE;PACKAGE_NAME;PACKAGE_SOURCES;KEYSTORE_PASSWORD" "DEPENDS;KEYSTORE" ${ARGN})
cmake_parse_arguments(ARG "INSTALL" "NAME;VERSION_CODE;PACKAGE_NAME;PACKAGE_SOURCES;KEYSTORE_PASSWORD;BUILDTOOLS_REVISION" "DEPENDS;KEYSTORE" ${ARGN})
# check the configuration
if(CMAKE_BUILD_TYPE STREQUAL "Debug")
@ -107,6 +107,13 @@ macro(add_qt_android_apk TARGET SOURCE_TARGET)
set(QT_ANDROID_APP_PACKAGE_NAME org.qtproject.${SOURCE_TARGET})
endif()
# set the Android SDK build-tools revision
if(ARG_BUILDTOOLS_REVISION)
set(QT_ANDROID_SDK_BUILDTOOLS_REVISION ${ARG_BUILDTOOLS_REVISION})
else()
set(QT_ANDROID_SDK_BUILDTOOLS_REVISION "")
endif()
# define the application source package directory
if(ARG_PACKAGE_SOURCES)
set(QT_ANDROID_APP_PACKAGE_SOURCE_ROOT ${ARG_PACKAGE_SOURCES})

1
qtdeploy.json.in

@ -3,6 +3,7 @@
"qt": "@QT_ANDROID_QT_ROOT@",
"sdk": "@QT_ANDROID_SDK_ROOT@",
"ndk": "@QT_ANDROID_NDK_ROOT@",
"sdkBuildToolsRevision": "@QT_ANDROID_SDK_BUILDTOOLS_REVISION@",
"toolchain-prefix": "@ANDROID_TOOLCHAIN_MACHINE_NAME@",
"tool-prefix": "@ANDROID_TOOLCHAIN_MACHINE_NAME@",
"toolchain-version": "@ANDROID_COMPILER_VERSION@",