diff options
| author | Alexey Edelev <alexey.edelev@qt.io> | 2022-01-26 15:44:09 +0100 |
|---|---|---|
| committer | Qt Cherry-pick Bot <cherrypick_bot@qt-project.org> | 2022-01-27 06:55:07 +0000 |
| commit | b6b2d2bff58ac170299b1f1a42c695b8ead391d5 (patch) | |
| tree | 5e6a3941d105e42653501bf18650f2808fbb35fa /src/corelib/Qt6AndroidMacros.cmake | |
| parent | 0aea581c4e2f0db90d13f28a8c5830faa1d2404f (diff) | |
Check if 'aab' target exists when adding <target>_make_aab as dependency
The global 'aab' target has its own switch QT_NO_GLOBAL_AAB_TARGET
that prevents it from being created. We need to check if 'aab' target
exists before adding <target>_make_aab as a dependency.
Change-Id: Iea569e3b6c7dfb6d0efa60dd2001fb9de161f725
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
(cherry picked from commit 4ecbebebf7bfe1eaf5685abca9e068087587df03)
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 | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/corelib/Qt6AndroidMacros.cmake b/src/corelib/Qt6AndroidMacros.cmake index 22e3ca614d..56faedb121 100644 --- a/src/corelib/Qt6AndroidMacros.cmake +++ b/src/corelib/Qt6AndroidMacros.cmake @@ -327,9 +327,11 @@ function(qt6_android_add_apk_target target) endif() # Make global apk and aab targets depend on the current apk target. + if(TARGET aab) + add_dependencies(aab ${target}_make_aab) + endif() if(TARGET apk) add_dependencies(apk ${target}_make_apk) - add_dependencies(aab ${target}_make_aab) _qt_internal_create_global_apk_all_target_if_needed() endif() |