diff options
| author | Michal Klocek <michal.klocek@qt.io> | 2023-08-15 18:43:48 +0200 |
|---|---|---|
| committer | Michal Klocek <michal.klocek@qt.io> | 2023-11-14 11:52:17 +0100 |
| commit | a09f5c4d5ae11ac338f09de044b72b6fc6ac00cc (patch) | |
| tree | e3ce23cbd8361cc99abdb29fa3c58f2605d49226 /configure.cmake | |
| parent | 71b4ebbf035d7a08184a43b896c4d51e1391421a (diff) | |
Add android on windows build support
Add builds for android on windows platform. These
are required by qt release scripts to create armv7 targets
on windows.
Note new 'is_mingw' setting for toolchainis. This required
as andorid on windows build use mingw toolchain as a
host toolchian. Main gn_arg argument 'is_mingw' is used
only for target/default toolchian, in this case gn drops
toolchian_args. However toolchain_args are evaluated in
case of secondary/host toolchain.
Override v8 snapshot toolchain to avoid pulling windows
(msvc or clang) toolchains and creating yet another set of
toolchain targets.
Task-number: QTBUG-83459
Change-Id: I927872d69e363277b9f90c3adda28518d6b6bb13
Reviewed-by: Michael Brüning <michael.bruning@qt.io>
Diffstat (limited to 'configure.cmake')
| -rw-r--r-- | configure.cmake | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/configure.cmake b/configure.cmake index 3d383fb50..7da77ef70 100644 --- a/configure.cmake +++ b/configure.cmake @@ -481,8 +481,8 @@ add_check_for_support( ) add_check_for_support( MODULES QtPdf - CONDITION LINUX OR (WIN32 AND NOT WIN_ARM_64) OR MACOS OR IOS OR (ANDROID AND NOT CMAKE_HOST_WIN32) - MESSAGE "Build can be done only on Linux, Windows, macO, iOS and Android(on non-Windows hosts only)." + CONDITION LINUX OR (WIN32 AND NOT WIN_ARM_64) OR MACOS OR IOS OR ANDROID + MESSAGE "Build can be done only on Linux, Windows, macO, iOS and Android." ) if(LINUX AND CMAKE_CROSSCOMPILING) get_gn_arch(testArch ${TEST_architecture_arch}) |