diff options
| author | Assam Boudjelthia <assam.boudjelthia@qt.io> | 2021-08-26 20:31:07 +0300 |
|---|---|---|
| committer | Assam Boudjelthia <assam.boudjelthia@qt.io> | 2021-09-07 17:08:25 +0000 |
| commit | 7dc05252a0df829bb5ea3994160d425bb0da26cb (patch) | |
| tree | e5bf699a45b70308e1801cbd830fdb690c7ff2c8 /src/tools/androiddeployqt/CMakeLists.txt | |
| parent | 7166a82844500238a4dad91857384479c7b35817 (diff) | |
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 <qt_ci_bot@qt-project.org>
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
Diffstat (limited to 'src/tools/androiddeployqt/CMakeLists.txt')
| -rw-r--r-- | src/tools/androiddeployqt/CMakeLists.txt | 9 |
1 files changed, 6 insertions, 3 deletions
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__ ) |