From 7a48cf4217faaf3ef89f866ce96ac27111390b58 Mon Sep 17 00:00:00 2001 From: Michal Klocek Date: Sun, 23 May 2021 17:39:28 +0200 Subject: Add cross compilation support to cmake builds Add arm cross-compile basic support. CMake does not support host builds. However we do host build with gn and changing that would require an extra effort to keep all necessary changes with Chromium upstream. Therefore let gn to perform the host build for required tools and just feed gn with all the build data. Add new build steps: * install gn into QT_HOST_PATH/libexec. * run hostBuild project to get native architecture and compiler * call PkgConfigHost to pass pkg-config paths to gn * create wrapper script for host pkg-config to escape yocto shell pkg config exports This change also splits gn toolchain into 3 toolchains host,target,v8 Now hostBuild provides host and v8 toolchain in case of cross compile. The build optimizations will follow in another patch. Fix not existing 'boot2qt' condition and enables more test on QEMU. Note this is tested only with yocto based images. Task-number: QTBUG-91760 Change-Id: Ic2bea12229acc71fbd36a848e9ed4fed7e14b485 (cherry picked from commit 3a962d8a2d3b70639a195fe5fd442f6c653bbe8f) Reviewed-by: Allan Sandfeld Jensen --- tests/auto/quick/CMakeLists.txt | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) (limited to 'tests/auto/quick') diff --git a/tests/auto/quick/CMakeLists.txt b/tests/auto/quick/CMakeLists.txt index 06b4bf6c2..6349e9335 100644 --- a/tests/auto/quick/CMakeLists.txt +++ b/tests/auto/quick/CMakeLists.txt @@ -3,11 +3,9 @@ add_subdirectory(publicapi) add_subdirectory(qquickwebenginedefaultsurfaceformat) add_subdirectory(qtbug-70248) add_subdirectory(uidelegates) -if(NOT boot2qt) - add_subdirectory(inspectorserver) - add_subdirectory(qmltests) - add_subdirectory(qquickwebengineview) -endif() +add_subdirectory(inspectorserver) +add_subdirectory(qmltests) +add_subdirectory(qquickwebengineview) if(QT_FEATURE_webenginequick_testsupport) add_subdirectory(qquickwebengineviewgraphics) endif() -- cgit v1.2.3