summaryrefslogtreecommitdiffstats
path: root/coin/provisioning/common/conan.ps1
diff options
context:
space:
mode:
authorKonstantin Tokarev <annulen@yandex.ru>2016-09-17 21:04:03 +0300
committerSimon Hausmann <simon.hausmann@qt.io>2016-09-18 05:57:54 +0000
commit23d11128396da8362f27d703287600699b5a962c (patch)
treec206028a3eafadd6b48c1bf4cfda730059275cbf /coin/provisioning/common/conan.ps1
parente1bfa77391fcf3d50f0d9f9375f5d123710395cf (diff)
Fixed value of CI_CONAN_BUILDINFO_DIR variable when provisioning Windows
Change-Id: I841783122edf82739826cc0a7672d8c809870e97 Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
Diffstat (limited to 'coin/provisioning/common/conan.ps1')
-rw-r--r--coin/provisioning/common/conan.ps14
1 files changed, 2 insertions, 2 deletions
diff --git a/coin/provisioning/common/conan.ps1 b/coin/provisioning/common/conan.ps1
index 117cdfc6..6d7cf07b 100644
--- a/coin/provisioning/common/conan.ps1
+++ b/coin/provisioning/common/conan.ps1
@@ -6,6 +6,8 @@ Download https://s3-eu-west-1.amazonaws.com/conanio-production/downloads/conan-w
Verify-Checksum $installer "719F30E6EED03149D75CDB28F80A7B873B43FF51"
& $installer /DIR=C:\Utils\Conan /VERYSILENT
+[Environment]::SetEnvironmentVariable("CI_CONAN_BUILDINFO_DIR", "C:\Utils\conanbuildinfos", "Machine")
+
function Run-Conan-Install
{
Param (
@@ -28,6 +30,4 @@ function Run-Conan-Install
"-s os=Windows -s arch=$($Arch) -s compiler.version=$($CompilerVersion)" `
-NoNewWindow -Wait
}
-
- [Environment]::SetEnvironmentVariable("CI_CONAN_BUILDINFO_DIR", $BuildinfoDir, "Machine")
}