diff options
| author | Alexey Edelev <alexey.edelev@qt.io> | 2022-02-22 16:05:58 +0100 |
|---|---|---|
| committer | Qt Cherry-pick Bot <cherrypick_bot@qt-project.org> | 2022-02-24 05:41:53 +0000 |
| commit | 884b9ab4b38596f9bd8dbac5a400921c355c0d87 (patch) | |
| tree | 2825b33e3f056b01695f9e6c0957483c66b5d413 /src/corelib/Qt6AndroidMacros.cmake | |
| parent | f6196782047d97159a327eb0700e4301efaf619c (diff) | |
Allow calling qt6_android_add_apk_target twice
If qt6_android_add_apk_target is called manually in user project this
might cause duplicated targets issue when calling the finalizer(either
manually or in a defer call).
Skip the qt6_android_add_apk_target body if target is already
registered in _qt_apk_targets list.
Change-Id: I36ef569227e0c5f0f077446bbe5d7e8d8fc0bfc6
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
(cherry picked from commit 708eb85e38acbe6c7aea4b95d92a9090f38375c9)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
Diffstat (limited to 'src/corelib/Qt6AndroidMacros.cmake')
| -rw-r--r-- | src/corelib/Qt6AndroidMacros.cmake | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/src/corelib/Qt6AndroidMacros.cmake b/src/corelib/Qt6AndroidMacros.cmake index df799becc4..ad12c6c7bd 100644 --- a/src/corelib/Qt6AndroidMacros.cmake +++ b/src/corelib/Qt6AndroidMacros.cmake @@ -325,6 +325,12 @@ endif() # Add custom target to package the APK function(qt6_android_add_apk_target target) + # Avoid calling qt6_android_add_apk_target twice + get_property(apk_targets GLOBAL PROPERTY _qt_apk_targets) + if("${target}" IN_LIST apk_targets) + return() + endif() + get_target_property(deployment_file ${target} QT_ANDROID_DEPLOYMENT_SETTINGS_FILE) if (NOT deployment_file) message(FATAL_ERROR "Target ${target} is not a valid android executable target\n") |