From 4b4f0be08debcfde62caf4066222b348ce65dea1 Mon Sep 17 00:00:00 2001 From: Cristian Adam Date: Tue, 23 Jun 2020 16:56:26 +0200 Subject: CMake: fix tst_qtiff, tst_qrawfont on MinGW x86 CMake was picking up libtiff and libfreetype from Strawberry Perl MinGW distribution. By specifying -DFEATURE_system_tiff=OFF and -DFEATURE_system_freetype=OFF we should fix these problems. -DFEATURE_system_jpeg=OFF was also added, even though tests are not failing. Task-number: QTBUG-84886 Change-Id: I324304bfbf8fcdb2de04ad0481eca1c7534a3cfd Reviewed-by: Alexandru Croitor --- coin/platform_configs/cmake_platforms.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'coin/platform_configs') diff --git a/coin/platform_configs/cmake_platforms.yaml b/coin/platform_configs/cmake_platforms.yaml index 9a7337b7..bf45d2e8 100644 --- a/coin/platform_configs/cmake_platforms.yaml +++ b/coin/platform_configs/cmake_platforms.yaml @@ -44,5 +44,5 @@ Configurations: - Template: 'qtci-windows-7-x86-3' Compiler: 'Mingw' - Configure arguments: '-DCMAKE_C_COMPILER=gcc -DCMAKE_CXX_COMPILER=g++ -DCMAKE_BUILD_TYPE=RelWithDebInfo -DFEATURE_separate_debug_info=ON -DBUILD_EXAMPLES=OFF -DOPENSSL_ROOT_DIR={{.Env.OPENSSL_INCLUDE_x86}}\.. -DFEATURE_system_zlib=OFF' + Configure arguments: '-DCMAKE_C_COMPILER=gcc -DCMAKE_CXX_COMPILER=g++ -DCMAKE_BUILD_TYPE=RelWithDebInfo -DFEATURE_separate_debug_info=ON -DBUILD_EXAMPLES=OFF -DOPENSSL_ROOT_DIR={{.Env.OPENSSL_INCLUDE_x86}}\.. -DFEATURE_system_zlib=OFF -DFEATURE_system_tiff=OFF -DFEATURE_system_freetype=OFF -DFEATURE_system_jpeg=OFF' Environment variables: ['Path={{.Env.MINGW810_i686}}\bin;{{.Env.Path}}'] -- cgit v1.2.3