From a97bdde4d485fe0bde1a12c4307ae72a35b54c46 Mon Sep 17 00:00:00 2001 From: Alexandru Croitor Date: Thu, 9 Jul 2020 10:22:05 +0200 Subject: [PATCH] CMake: fix tst_qtiff on MinGW CMake is picking up libtiff from the provisioned Strawberry Perl location. Specify -DFEATURE_system_tiff=OFF in the NON_QTBASE_CONFIGURE_ARGS to disable usage of that library, and thus fix the crashing test. Amends 4b4f0be08debcfde62caf4066222b348ce65dea1 Task-number: QTBUG-84886 Change-Id: Iecc880d367db76e91f8c5f92b0849f1ad43382a3 Reviewed-by: Joerg Bornemann --- coin/platform_configs/cmake_platforms.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/coin/platform_configs/cmake_platforms.yaml b/coin/platform_configs/cmake_platforms.yaml index 0a975232..f2624768 100644 --- a/coin/platform_configs/cmake_platforms.yaml +++ b/coin/platform_configs/cmake_platforms.yaml @@ -50,4 +50,4 @@ Configurations: Template: 'qtci-windows-10-x86_64-17' 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_x64}}\.. -DFEATURE_system_zlib=OFF -DFEATURE_system_tiff=OFF -DFEATURE_system_freetype=OFF -DFEATURE_system_jpeg=OFF' - Environment variables: ['Path={{.Env.MINGW810}}\bin;{{.Env.Path}}', 'NON_QTBASE_CONFIGURE_ARGS='] + Environment variables: ['Path={{.Env.MINGW810}}\bin;{{.Env.Path}}', 'NON_QTBASE_CONFIGURE_ARGS=-DFEATURE_system_tiff=OFF']