From 1f52b8f8e5c921a8d659b45ae94f58c4b37fafb7 Mon Sep 17 00:00:00 2001 From: Alexandru Croitor Date: Mon, 4 May 2020 11:30:53 +0200 Subject: CMake: Change armv7 configuration to prepare for building tests Switch the configuration to have release + developer-build similar to the qmake configurations. Add debug info for extra spiciness. Specify a new env variable called QT_SYSROOT_FOR_RUNNING_TESTS which will be used by the qtbase instructions to set QEMU_LD_PREFIX, which is needed to run the tests via qemu. Specify the QT_QUICK_BACKEND=software env var as well as the GST_PLUGIN_SCANNER env var, because the qmake configurations do it. Make sure to cross-build tools, because some of the tests like tst_uic and tst_rcc expect the tools to be there. Note that DisableTests feature is left on purpose, so we can decouple the building from the testing in 2 different steps. Task-number: QTBUG-84423 Task-number: QTBUG-83968 Change-Id: Icf6b12e6942c6ae6a0445eeac3f88704ca797148 Reviewed-by: Joerg Bornemann --- coin/platform_configs/qtbase.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'coin/platform_configs/qtbase.yaml') diff --git a/coin/platform_configs/qtbase.yaml b/coin/platform_configs/qtbase.yaml index 7777d24f..49e30e04 100644 --- a/coin/platform_configs/qtbase.yaml +++ b/coin/platform_configs/qtbase.yaml @@ -7,7 +7,7 @@ Configurations: Target arch: 'armv7' Compiler: 'GCC' Features: ['DisableTests'] - Environment variables: ['TARGET_CONFIGURE_ARGS=-DBUILD_EXAMPLES=OFF -DCMAKE_TOOLCHAIN_FILE={{.Env.QEMUARMV7_TOOLCHAIN_SYSROOT}}/../x86_64-pokysdk-linux/usr/share/cmake/OEToolchainConfig.cmake -DQT_FEATURE_system_harfbuzz=OFF', 'QT_YOCTO_ENVSETUP={{.Env.QEMUARMV7_TOOLCHAIN_SYSROOT}}/../../environment-setup-armv7at2hf-neon-poky-linux-gnueabi', "QT_CMAKE_DIR=/opt/cmake-3.17.2/bin"] + Environment variables: ['TARGET_CONFIGURE_ARGS=-DBUILD_EXAMPLES=OFF -DFEATURE_developer_build=ON -DCMAKE_BUILD_TYPE=RelWithDebInfo -DQT_BUILD_TOOLS_WHEN_CROSSCOMPILING=ON -DCMAKE_TOOLCHAIN_FILE={{.Env.QEMUARMV7_TOOLCHAIN_SYSROOT}}/../x86_64-pokysdk-linux/usr/share/cmake/OEToolchainConfig.cmake -DQT_FEATURE_system_harfbuzz=OFF', 'QT_YOCTO_ENVSETUP={{.Env.QEMUARMV7_TOOLCHAIN_SYSROOT}}/../../environment-setup-armv7at2hf-neon-poky-linux-gnueabi', "QT_CMAKE_DIR=/opt/cmake-3.17.2/bin", 'QT_SYSROOT_FOR_RUNNING_TESTS={{.Env.QEMUARMV7_TOOLCHAIN_SYSROOT}}', 'GST_PLUGIN_SCANNER=/opt/yocto-armv7/sysroots/armv7at2hf-neon-poky-linux-gnueabi/usr/libexec/gstreamer-1.0/gst-plugin-scanner', 'QT_QUICK_BACKEND=software'] Configure arguments: '-DBUILD_EXAMPLES=OFF -DOPENSSL_ROOT_DIR={{.Env.OPENSSL_HOME}} -DCMAKE_BUILD_TYPE=RelWithDebInfo -DFEATURE_separate_debug_info=ON -DFEATURE_system_jpeg=OFF -DFEATURE_system_png=OFF -DFEATURE_system_pcre2=OFF -DFEATURE_system_harfbuzz=OFF -DFEATURE_system_doubleconversion=OFF -DFEATURE_libudev=OFF' - Template: 'qtci-linux-openSUSE-15.1-x86_64' -- cgit v1.2.3