diff options
| -rw-r--r-- | coin/provisioning/common/03-conan.ps1 | 2 | ||||
| -rw-r--r-- | coin/provisioning/qtci-windows-10-x86_64/03-conan.ps1 | 8 |
2 files changed, 9 insertions, 1 deletions
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 |