diff options
| author | Liang Qi <liang.qi@qt.io> | 2016-09-30 16:13:52 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2016-09-30 16:13:52 +0200 |
| commit | 0e4688d36ea143b285e2ecf96073c83142bdfe41 (patch) | |
| tree | ffbf520c764e4942af7569b1341bf86ad56d16ee /coin/provisioning/qtci-windows-10-x86/conan.ps1 | |
| parent | 2fb27862aa760d88790b23e0eab3cd3be5341054 (diff) | |
| parent | a5b6125466344f0f9b73691b97fbc809c5ad9f7f (diff) | |
Merge remote-tracking branch 'origin/5.8' into dev
Conflicts:
.gitmodules
Change-Id: I6f517c976152f2da390c556c7c9da08aaec4be90
Diffstat (limited to 'coin/provisioning/qtci-windows-10-x86/conan.ps1')
| -rw-r--r-- | coin/provisioning/qtci-windows-10-x86/conan.ps1 | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/coin/provisioning/qtci-windows-10-x86/conan.ps1 b/coin/provisioning/qtci-windows-10-x86/conan.ps1 new file mode 100644 index 00000000..718d25de --- /dev/null +++ b/coin/provisioning/qtci-windows-10-x86/conan.ps1 @@ -0,0 +1,8 @@ +. "$PSScriptRoot\..\common\conan.ps1" + +Run-Conan-Install ` + -ConanfilesDir "$PSScriptRoot\conanfiles" ` + -BuildinfoDir MSVC2015-x86 ` + -Arch x86 ` + -Compiler "Visual Studio" ` + -CompilerVersion 14 |