From 7dc05252a0df829bb5ea3994160d425bb0da26cb Mon Sep 17 00:00:00 2001 From: Assam Boudjelthia Date: Thu, 26 Aug 2021 20:31:07 +0300 Subject: Allow building android{deployqt, testrunner} under target host_tools When doing a cross build for Android we need only the host tools which are available under cmake's host_tools target, but androiddeployqt and androidtestrunner are not part of that. This fixes that. Pick-to: 6.2 Change-Id: Icdbc4a78ca050b66ec8df656d9ec766ef6c9f4b9 Reviewed-by: Qt CI Bot Reviewed-by: Alexandru Croitor --- src/tools/androiddeployqt/CMakeLists.txt | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) (limited to 'src/tools/androiddeployqt/CMakeLists.txt') diff --git a/src/tools/androiddeployqt/CMakeLists.txt b/src/tools/androiddeployqt/CMakeLists.txt index 941e160318..98cd79a334 100644 --- a/src/tools/androiddeployqt/CMakeLists.txt +++ b/src/tools/androiddeployqt/CMakeLists.txt @@ -4,7 +4,10 @@ ## androiddeployqt App: ##################################################################### -qt_internal_add_app(androiddeployqt +qt_get_tool_target_name(target_name androiddeployqt) +qt_internal_add_tool(${target_name} + TARGET_DESCRIPTION "Qt Android Deployment Tool" + TOOLS_TARGET Core SOURCES main.cpp DEFINES @@ -16,7 +19,7 @@ qt_internal_add_app(androiddeployqt INCLUDE_DIRECTORIES ../shared ) -set_target_properties(androiddeployqt PROPERTIES +set_target_properties(${target_name} PROPERTIES WIN32_EXECUTABLE FALSE ) @@ -26,7 +29,7 @@ set_target_properties(androiddeployqt PROPERTIES ## Scopes: ##################################################################### -qt_internal_extend_target(androiddeployqt CONDITION windows +qt_internal_extend_target(${target_name} CONDITION windows COMPILE_OPTIONS -U__STRICT_ANSI__ ) -- cgit v1.2.3