summaryrefslogtreecommitdiffstats
path: root/cmake
diff options
context:
space:
mode:
authorAlexey Edelev <alexey.edelev@qt.io>2021-11-16 17:35:09 +0100
committerQt Cherry-pick Bot <cherrypick_bot@qt-project.org>2021-11-26 18:16:52 +0000
commit3645e552fd03fa05abd6cc21e4455ead5ca3c7f6 (patch)
treec6d0dc3d34b19601f0dc0ae56961698ec8e59a76 /cmake
parent97fc812b325054bda60fce7856790ddb364cd9a8 (diff)
Add missing dependency of ${target}_check to ${target}_make_apk
When building for and running the '_check' target in Android we need to make sure that target apk is assembled and ready for deployment. Change-Id: Ifc63aac230f0bb8375d319ec443174c5a436485e Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io> Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io> (cherry picked from commit aba1432daee254b7db544e61d9f5ec6b42670d9a) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
Diffstat (limited to 'cmake')
-rw-r--r--cmake/QtTestHelpers.cmake3
1 files changed, 3 insertions, 0 deletions
diff --git a/cmake/QtTestHelpers.cmake b/cmake/QtTestHelpers.cmake
index a9abb60493..0b4ff0936e 100644
--- a/cmake/QtTestHelpers.cmake
+++ b/cmake/QtTestHelpers.cmake
@@ -344,6 +344,9 @@ function(qt_internal_add_test name)
)
if(TARGET "${name}")
add_dependencies("${name}_check" "${name}")
+ if(ANDROID)
+ add_dependencies("${name}_check" "${name}_make_apk")
+ endif()
endif()
if(ANDROID OR IOS OR WINRT)