diff options
| author | Assam Boudjelthia <assam.boudjelthia@qt.io> | 2021-05-25 20:17:04 +0300 |
|---|---|---|
| committer | Assam Boudjelthia <assam.boudjelthia@qt.io> | 2021-06-02 08:19:54 +0000 |
| commit | 71348437939e62b0e3b86888e966b300ff1e2855 (patch) | |
| tree | 76f6ff3e82b9d42df0728ae4acfedc2c6d651e70 /src | |
| parent | ed431caa27672427d28f8ecde667a3a064ddda7e (diff) | |
CMake: Add Android's prepare_apk_dir target to ALL
Since Qt Creator uses androiddeployqt custom commands it still needs a
step to prepare the apk dir before building it, so add this to ALL
to avoid having to call it manually in creator.
Pick-to: 6.1
Change-Id: I0a2816244589e9b296a326fcc1abf8c08aabfea7
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
Diffstat (limited to 'src')
| -rw-r--r-- | src/corelib/Qt6AndroidMacros.cmake | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/corelib/Qt6AndroidMacros.cmake b/src/corelib/Qt6AndroidMacros.cmake index 181be819e2..cf22166e7b 100644 --- a/src/corelib/Qt6AndroidMacros.cmake +++ b/src/corelib/Qt6AndroidMacros.cmake @@ -302,10 +302,10 @@ function(qt6_android_add_apk_target target) set(apk_intermediate_file_path "${apk_intermediate_dir}/${apk_file_name}") # This target is used by Qt Creator's Android support. - add_custom_target(${target}_prepare_apk_dir + add_custom_target(${target}_prepare_apk_dir ALL DEPENDS ${target} COMMAND ${CMAKE_COMMAND} - -E copy $<TARGET_FILE:${target}> + -E copy_if_different $<TARGET_FILE:${target}> "${apk_final_dir}/libs/${CMAKE_ANDROID_ARCH_ABI}/$<TARGET_FILE_NAME:${target}>" COMMENT "Copying ${target} binary to apk folder" ) |