From 6837a847bb89db903a81ae37962c3670938d49ff Mon Sep 17 00:00:00 2001 From: Konstantin Tokarev Date: Tue, 4 Jul 2017 16:27:43 +0300 Subject: Provisioning: install x86 conan packages on MSVC2015-x86_64 Win 10 host Also upgrade to Conan 0.24.0. Task-number: QTBUG-61829 Change-Id: Ia01609e5f2d8121eb216b03bc8e95bca7225042e Reviewed-by: Simon Hausmann --- coin/provisioning/common/03-conan.ps1 | 2 +- coin/provisioning/qtci-windows-10-x86_64/03-conan.ps1 | 8 ++++++++ 2 files changed, 9 insertions(+), 1 deletion(-) (limited to 'coin') diff --git a/coin/provisioning/common/03-conan.ps1 b/coin/provisioning/common/03-conan.ps1 index f281e6e0..9449c340 100644 --- a/coin/provisioning/common/03-conan.ps1 +++ b/coin/provisioning/common/03-conan.ps1 @@ -2,7 +2,7 @@ $scriptsPath = "C:\Python27\Scripts" -& "$scriptsPath\pip.exe" install --upgrade conan==0.20.2 +& "$scriptsPath\pip.exe" install --upgrade conan==0.24.0 [Environment]::SetEnvironmentVariable("CI_CONAN_BUILDINFO_DIR", "C:\Utils\conanbuildinfos", "Machine") diff --git a/coin/provisioning/qtci-windows-10-x86_64/03-conan.ps1 b/coin/provisioning/qtci-windows-10-x86_64/03-conan.ps1 index 78de7043..5d7826bd 100644 --- a/coin/provisioning/qtci-windows-10-x86_64/03-conan.ps1 +++ b/coin/provisioning/qtci-windows-10-x86_64/03-conan.ps1 @@ -7,3 +7,11 @@ Run-Conan-Install ` -Compiler "Visual Studio" ` -CompilerVersion 14 ` -CompilerRuntime MD + +Run-Conan-Install ` + -ConanfilesDir "$PSScriptRoot\conanfiles" ` + -BuildinfoDir MSVC2015-x86 ` + -Arch x86 ` + -Compiler "Visual Studio" ` + -CompilerVersion 14 ` + -CompilerRuntime MD -- cgit v1.2.3