diff options
author | Konstantin Tokarev <annulen@yandex.ru> | 2017-07-06 17:49:00 +0300 |
---|---|---|
committer | Liang Qi <liang.qi@qt.io> | 2017-07-09 04:51:54 +0000 |
commit | dd5096c6c7b9c48524096cfda8b56b8619c82ea2 (patch) | |
tree | 7641f224ca937aa7aaf2a54f670af8bbed4c5dd3 /coin/provisioning/common/03-conan.ps1 | |
parent | 6837a847bb89db903a81ae37962c3670938d49ff (diff) |
Conan: update ICU to 59.1, added VS2017 packages
MinGW packages will be upgraded in another patch.
Task-number: QTBUG-61728
Change-Id: Ie6a1996b7850282a7cdcbe5ceba61f1ce473cf69
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
Diffstat (limited to 'coin/provisioning/common/03-conan.ps1')
-rw-r--r-- | coin/provisioning/common/03-conan.ps1 | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/coin/provisioning/common/03-conan.ps1 b/coin/provisioning/common/03-conan.ps1 index 9449c340..2c9d9f8d 100644 --- a/coin/provisioning/common/03-conan.ps1 +++ b/coin/provisioning/common/03-conan.ps1 @@ -4,6 +4,9 @@ $scriptsPath = "C:\Python27\Scripts" & "$scriptsPath\pip.exe" install --upgrade conan==0.24.0 +# Use Qt Project repository by default +& "$scriptsPath\conan.exe" remote add qtproject https://api.bintray.com/conan/qtproject/conan --insert + [Environment]::SetEnvironmentVariable("CI_CONAN_BUILDINFO_DIR", "C:\Utils\conanbuildinfos", "Machine") function Start-Process-Logged |