summaryrefslogtreecommitdiffstats
path: root/coin/provisioning/qtci-windows-10-x86/11-conan.ps1
diff options
context:
space:
mode:
authorKonstantin Tokarev <annulen@yandex.ru>2019-07-26 18:57:59 +0300
committerKonstantin Tokarev <annulen@yandex.ru>2019-07-26 19:52:45 +0300
commit716640a4770c8e11ab5f6e6ebb8db64868c2679b (patch)
treea706c8e592f629a87cb99c72171409a8207319a6 /coin/provisioning/qtci-windows-10-x86/11-conan.ps1
parent4bf0ba2ba18e0caf2e4e99ab68a1f506a9eb3705 (diff)
Provisioning: update Conan and Conan packages
[*] Update Conan to 1.17.0, adjust to change in command line arguments [*] Update Conan packages to up-to-date versions, add libjpeg-turbo and packages for 64-bit MinGW [*] Rename 03-conan.ps1 to 11-conan.ps1 so that it is installed after Python 3 and MinGW [*] Add license header to conan.ps1 Change-Id: Ibc451ddc54a7227eb6d3a007a20351e77a46875f Reviewed-by: MÃ¥rten Nordheim <marten.nordheim@qt.io>
Diffstat (limited to 'coin/provisioning/qtci-windows-10-x86/11-conan.ps1')
-rw-r--r--coin/provisioning/qtci-windows-10-x86/11-conan.ps117
1 files changed, 17 insertions, 0 deletions
diff --git a/coin/provisioning/qtci-windows-10-x86/11-conan.ps1 b/coin/provisioning/qtci-windows-10-x86/11-conan.ps1
new file mode 100644
index 00000000..d33ceea8
--- /dev/null
+++ b/coin/provisioning/qtci-windows-10-x86/11-conan.ps1
@@ -0,0 +1,17 @@
+. "$PSScriptRoot\..\common\windows\conan.ps1"
+
+Run-Conan-Install `
+ -ConanfilesDir "$PSScriptRoot\conanfiles" `
+ -BuildinfoDir MSVC2015-x86 `
+ -Arch x86 `
+ -Compiler "Visual Studio" `
+ -CompilerVersion 14 `
+ -CompilerRuntime MD
+
+Run-Conan-Install `
+ -ConanfilesDir "$PSScriptRoot\conanfiles" `
+ -BuildinfoDir MSVC2017-x86 `
+ -Arch x86 `
+ -Compiler "Visual Studio" `
+ -CompilerVersion 15 `
+ -CompilerRuntime MD