diff options
| author | Aleix Pol <aleixpol@kde.org> | 2015-11-16 16:55:36 +0100 |
|---|---|---|
| committer | Aleix Pol <aleixpol@kde.org> | 2015-11-16 16:55:36 +0100 |
| commit | 208ad2b3c1959a70bc9a7b738e89ad3ee4ae2446 (patch) | |
| tree | f776dd1882363c66684730465f3b3b94f518174c | |
| parent | f55a8d93f17128b53872193d2bc62acd525f3424 (diff) | |
| download | extra-cmake-modules-208ad2b3c1959a70bc9a7b738e89ad3ee4ae2446.tar.gz extra-cmake-modules-208ad2b3c1959a70bc9a7b738e89ad3ee4ae2446.tar.bz2 | |
Clean export dir before generating an APK again
Makes sure there isn't old stuff still there, it didn't save much time to
keep the files around anyway.
| -rw-r--r-- | toolchain/Android.cmake | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/toolchain/Android.cmake b/toolchain/Android.cmake index a60771bc..81ded8f5 100644 --- a/toolchain/Android.cmake +++ b/toolchain/Android.cmake @@ -180,6 +180,7 @@ if(DEFINED QTANDROID_EXPORTED_TARGET AND NOT TARGET ${CREATEAPK_TARGET_NAME}) add_custom_target(${CREATEAPK_TARGET_NAME} COMMAND cmake -E echo "Generating $<TARGET_NAME:${QTANDROID_EXPORTED_TARGET}> with $<TARGET_FILE_DIR:Qt5::qmake>/androiddeployqt" + COMMAND cmake -E remove_directory "${EXPORT_DIR}" COMMAND cmake -E copy_directory "${ANDROID_APK_DIR}" "${EXPORT_DIR}" COMMAND cmake -E copy "$<TARGET_FILE:${QTANDROID_EXPORTED_TARGET}>" "${EXECUTABLE_DESTINATION_PATH}" COMMAND cmake -DINPUT_FILE="${QTANDROID_EXPORTED_TARGET}-deployment.json.in" -DOUTPUT_FILE="${QTANDROID_EXPORTED_TARGET}-deployment.json" "-DTARGET_DIR=$<TARGET_FILE_DIR:${QTANDROID_EXPORTED_TARGET}>" "-DTARGET_NAME=${QTANDROID_EXPORTED_TARGET}" -P ${_CMAKE_ANDROID_DIR}/specifydependencies.cmake |