diff options
| author | Leander Beernaert <leander.beernaert@qt.io> | 2019-06-05 12:07:42 +0200 |
|---|---|---|
| committer | Leander Beernaert <leander.beernaert@qt.io> | 2019-06-05 14:20:31 +0000 |
| commit | 04da0df56851565fe93f69be72efbba2b492d5db (patch) | |
| tree | fe0bc43e08e70b0d5dd798f02f48fc29341dab17 /src/tools | |
| parent | bc9409d85748c7167a9e8e7eec82fa6c9420ea3d (diff) | |
Android: SDK Support
Enable building androiddeployqt when performing host builds only.
Added QtPlatformAndroid.cmake to locate Java and the setup the
android SDK platform when building on android.
Install the androiddeployqt support files when performing a host
build.
Added ANDROID_SDK_ROOT configuration variable for specifying the
android sdk directory.
Generating the deployment-settings.json will be done in another
change.
Change-Id: I1bf15315af4ed904d2fb1d22b0e8e834df32d6ed
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
Diffstat (limited to 'src/tools')
| -rw-r--r-- | src/tools/CMakeLists.txt | 5 | ||||
| -rw-r--r-- | src/tools/androiddeployqt/CMakeLists.txt | 27 |
2 files changed, 32 insertions, 0 deletions
diff --git a/src/tools/CMakeLists.txt b/src/tools/CMakeLists.txt index 77942a9c7e..f1f0a8ce93 100644 --- a/src/tools/CMakeLists.txt +++ b/src/tools/CMakeLists.txt @@ -5,3 +5,8 @@ if (QT_FEATURE_dbus) endif() add_subdirectory(qlalr) add_subdirectory(qvkgen) + +# Only include the following tools when performing a host build +if(NOT CMAKE_CROSSCOMPILING) + add_subdirectory(androiddeployqt) +endif() diff --git a/src/tools/androiddeployqt/CMakeLists.txt b/src/tools/androiddeployqt/CMakeLists.txt new file mode 100644 index 0000000000..75c7115e85 --- /dev/null +++ b/src/tools/androiddeployqt/CMakeLists.txt @@ -0,0 +1,27 @@ +# Generated from androiddeployqt.pro. + +##################################################################### +## androiddeployqt Binary: +##################################################################### + +add_qt_executable(androiddeployqt + SOURCES + main.cpp + DEFINES + QT_NO_CAST_FROM_ASCII + QT_NO_CAST_TO_ASCII + QT_NO_FOREACH +) + +#### Keys ignored in scope 1:.:.:androiddeployqt.pro:<TRUE>: +# CONFIG = "console" +# _LOADED = "qt_app" +# _OPTION = "host_build" + +## Scopes: +##################################################################### + +extend_target(androiddeployqt CONDITION windows + COMPILE_OPTIONS + -U__STRICT_ANSI__ +) |