summaryrefslogtreecommitdiffstats
path: root/src/core/tools
diff options
context:
space:
mode:
authorMichal Klocek <michal.klocek@qt.io>2022-04-20 08:48:02 +0200
committerQt Cherry-pick Bot <cherrypick_bot@qt-project.org>2022-05-04 07:14:34 +0000
commita9b936e2b80170783e35640035bfef970aef761e (patch)
tree6c83dec024ad0b42982375153d50fe41e74b0be5 /src/core/tools
parent2c0a66dd1c308923639ad964f067c6e49b626e26 (diff)
Support cross-compilation on macOS
So far we only supported a cross-compiling with universal builds, however qmake also supports 'regular' cross compilation (by setting '-device-option'). This is semi-supported with qt-cmake as we need to provide additional configure defines like: * CMAKE_OSX_ARCHITECTURES=arm64 * CMAKE_SYSTEM_NAME=Darwin * CMAKE_OSX_DEPLOYMENT_TARGET=10.14 It might seem to be a far fetched issue, however in case of webengine doing the cross compilation for only one architecture allows to save compile times when testing only arm64 builds. Note we do not need to create gn toolchains for that case, however unlike universal builds it requires host qt build for tools. Change-Id: Ica8470fdd4cad4866c1470e0403ffd019eaf39a6 Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io> (cherry picked from commit ba74eaba11b2df9d6c2b23f7595e7bb1a03e911e) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
Diffstat (limited to 'src/core/tools')
-rw-r--r--src/core/tools/CMakeLists.txt2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/core/tools/CMakeLists.txt b/src/core/tools/CMakeLists.txt
index 8f764c94b..3b917fc90 100644
--- a/src/core/tools/CMakeLists.txt
+++ b/src/core/tools/CMakeLists.txt
@@ -3,7 +3,7 @@
# WEBENGINECORE DICT CONVERT TOOL
##
-if(QT_FEATURE_webengine_spellchecker)
+if(QT_FEATURE_webengine_spellchecker AND NOT CMAKE_CROSSCOMPILING)
qt_get_tool_target_name(dict_target_name qwebengine_convert_dict)
qt_internal_add_tool(${dict_target_name}
TARGET_DESCRIPTION "QtWebEngine Dictionary Conversion Tool"