lili/qt5
1
0
Fork 0
mirror of git://code.qt.io/qt/qt5.git synced 2026-02-01 19:36:04 +08:00
Code Issues Packages Projects Releases Wiki Activity

Provisioning: install x86 conan packages on MSVC2015-x86_64 Win 10 host

Browse Source 
Also upgrade to Conan 0.24.0.

Task-number: QTBUG-61829
Change-Id: Ia01609e5f2d8121eb216b03bc8e95bca7225042e
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
This commit is contained in:
Konstantin Tokarev
2017-07-04 16:27:43 +03:00
committed by Liang Qi
parent a96119c121
commit 6837a847bb
2 changed files with 9 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
coin/provisioning/common/03-conan.ps1
View File

@@ -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")

8
coin/provisioning/qtci-windows-10-x86_64/03-conan.ps1
View File

@@ -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