From 5ce8c724d2c51d896271a3a562f10de1fe151d87 Mon Sep 17 00:00:00 2001 From: Heikki Halmet Date: Mon, 13 Dec 2021 16:00:55 +0200 Subject: Remove duplicate MinGW environment variables Pick-to: 6.3 Pick-to: 6.2 Change-Id: I2018b0c46b9708f699e5da6155e95151a49394fb Reviewed-by: Toni Saario --- coin/platform_configs/cmake_platforms.yaml | 2 -- 1 file changed, 2 deletions(-) (limited to 'coin/platform_configs') diff --git a/coin/platform_configs/cmake_platforms.yaml b/coin/platform_configs/cmake_platforms.yaml index 03380e53..74322a57 100644 --- a/coin/platform_configs/cmake_platforms.yaml +++ b/coin/platform_configs/cmake_platforms.yaml @@ -216,7 +216,6 @@ Configurations: - Template: 'qtci-windows-10_21H2-x86_64-51' Compiler: 'Mingw' - Environment variables: ['PATH=C:\MINGW1120\mingw64\bin;$PATH'] Features: ['Sccache'] Configure arguments: '-DCMAKE_C_COMPILER=gcc -DCMAKE_CXX_COMPILER=g++ -DFEATURE_developer_build=ON -DCMAKE_BUILD_TYPE=RelWithDebInfo -DFEATURE_separate_debug_info=ON -DBUILD_EXAMPLES=ON -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.MINGW1120}}\bin;{{.Env.Path}}', 'NON_QTBASE_CONFIGURE_ARGS=-DFEATURE_system_tiff=OFF', @@ -224,7 +223,6 @@ Configurations: - Template: 'qtci-windows-11_21H2-x86_64-51' Compiler: 'Mingw' - Environment variables: ['PATH=C:\MINGW1120\mingw64\bin;$PATH'] Features: ['Sccache', 'InsignificantTests'] Configure arguments: '-DCMAKE_C_COMPILER=gcc -DCMAKE_CXX_COMPILER=g++ -DFEATURE_developer_build=ON -DCMAKE_BUILD_TYPE=RelWithDebInfo -DFEATURE_separate_debug_info=ON -DBUILD_EXAMPLES=ON -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.MINGW1120}}\bin;{{.Env.Path}}', 'NON_QTBASE_CONFIGURE_ARGS=-DFEATURE_system_tiff=OFF', -- cgit v1.2.3