From 5fb198a15921dcb50e29bff9a8744fb28357d6f5 Mon Sep 17 00:00:00 2001 From: Toni Saario Date: Fri, 26 Jun 2020 15:08:26 +0300 Subject: [PATCH] Use same tier 2 template for all windows 10 targets MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit The cmake platform was not updated when other platform were updated to use -17 image. Change-Id: Ide69d7d6119f472529570960021de9f05e53d8bd Reviewed-by: Alexandru Croitor Reviewed-by: Tony Sarajärvi --- 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 67317c00..54cdcc1a 100644 --- a/coin/platform_configs/cmake_platforms.yaml +++ b/coin/platform_configs/cmake_platforms.yaml @@ -14,7 +14,7 @@ Configurations: Features: ['Packaging'] Configure arguments: '-DBUILD_EXAMPLES=OFF -DCMAKE_BUILD_TYPE=RelWithDebInfo -DFEATURE_framework=ON -DCMAKE_OSX_SYSROOT:PATH=/Applications/Xcode11.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.15.sdk -DCMAKE_OSX_DEPLOYMENT_TARGET=10.14 -DOPENSSL_ROOT_DIR=/usr/local/opt/openssl' - - Template: 'qtci-windows-10-x86_64-15' + Template: 'qtci-windows-10-x86_64-17' Compiler: 'MSVC2019' Features: ['Packaging'] Configure arguments: '-G"Ninja Multi-Config" -DCMAKE_CONFIGURATION_TYPES="RelWithDebInfo;Debug" -DBUILD_EXAMPLES=OFF -DBUILD_WITH_PCH=OFF -DOPENSSL_ROOT_DIR={{.Env.OPENSSL_INCLUDE_x64}}\.. -DFEATURE_system_zlib=OFF'