diff options
| author | Gabriel Souza Franco <gabrielfrancosouza@gmail.com> | 2020-09-11 09:49:50 -0300 |
|---|---|---|
| committer | Aleix Pol Gonzalez <aleixpol@kde.org> | 2020-09-16 14:53:29 +0000 |
| commit | 3672943cf1128470cae08c70f2d5c97887cd3125 (patch) | |
| tree | c1126fee0e5ea4046cc6b6e89b04f51539d35fda /toolchain/ECMAndroidDeployQt.cmake | |
| parent | 4a3659f1d474b8a94bd4d28e1ab919d7d4e6d28c (diff) | |
| download | extra-cmake-modules-3672943cf1128470cae08c70f2d5c97887cd3125.tar.gz extra-cmake-modules-3672943cf1128470cae08c70f2d5c97887cd3125.tar.bz2 | |
Store Android {min,target,compile}Sdk in variables
Also pass along these values to androiddeployqt
Diffstat (limited to 'toolchain/ECMAndroidDeployQt.cmake')
| -rw-r--r-- | toolchain/ECMAndroidDeployQt.cmake | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/toolchain/ECMAndroidDeployQt.cmake b/toolchain/ECMAndroidDeployQt.cmake index d5f70336..d6ef8778 100644 --- a/toolchain/ECMAndroidDeployQt.cmake +++ b/toolchain/ECMAndroidDeployQt.cmake @@ -78,7 +78,7 @@ function(ecm_androiddeployqt QTANDROID_EXPORTED_TARGET ECM_ADDITIONAL_FIND_ROOT_ COMMAND cmake -E copy "$<TARGET_FILE:${QTANDROID_EXPORTED_TARGET}>" "${EXECUTABLE_DESTINATION_PATH}" COMMAND LANG=C cmake "-DTARGET=$<TARGET_FILE:${QTANDROID_EXPORTED_TARGET}>" -P ${_CMAKE_ANDROID_DIR}/hasMainSymbol.cmake COMMAND LANG=C cmake -DINPUT_FILE="${QTANDROID_EXPORTED_TARGET}-deployment.json.in2" -DOUTPUT_FILE="${QTANDROID_EXPORTED_TARGET}-deployment.json" "-DTARGET=$<TARGET_FILE:${QTANDROID_EXPORTED_TARGET}>" "-DOUTPUT_DIR=$<TARGET_FILE_DIR:${QTANDROID_EXPORTED_TARGET}>" "-DEXPORT_DIR=${CMAKE_INSTALL_PREFIX}" "-DECM_ADDITIONAL_FIND_ROOT_PATH=\"${ECM_ADDITIONAL_FIND_ROOT_PATH}\"" "-DANDROID_EXTRA_LIBS=\"${ANDROID_EXTRA_LIBS}\"" -P ${_CMAKE_ANDROID_DIR}/specifydependencies.cmake - COMMAND $<TARGET_FILE_DIR:Qt5::qmake>/androiddeployqt --gradle --input "${QTANDROID_EXPORTED_TARGET}-deployment.json" --apk "${ANDROID_APK_OUTPUT_DIR}/${QTANDROID_EXPORTED_TARGET}-${CMAKE_ANDROID_ARCH_ABI}.apk" --output "${EXPORT_DIR}" --deployment bundled ${arguments} + COMMAND $<TARGET_FILE_DIR:Qt5::qmake>/androiddeployqt --gradle --input "${QTANDROID_EXPORTED_TARGET}-deployment.json" --apk "${ANDROID_APK_OUTPUT_DIR}/${QTANDROID_EXPORTED_TARGET}-${CMAKE_ANDROID_ARCH_ABI}.apk" --output "${EXPORT_DIR}" --android-platform android-${ANDROID_SDK_COMPILE_API} --deployment bundled ${arguments} ) add_custom_target(install-apk-${QTANDROID_EXPORTED_TARGET} |