diff options
| author | Konstantin Tokarev <annulen@yandex.ru> | 2017-07-06 14:26:44 +0300 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2017-07-09 04:51:48 +0000 |
| commit | a96119c1215e3409c85391e90a5b7827cd95d496 (patch) | |
| tree | e5cd7d79f0419bb9ff13317c4ff8e94f9a6aef7c /coin/provisioning/common/03-conan.ps1 | |
| parent | 5f37f812f967295165e60ce9be8ec69ad059b81a (diff) | |
Provisioning: move Conan manifests to common directory
We need to use x86 packages from qtci-windows-10-x86_64 configuration,
so splitting Conan manifests by configuration is not a good idea anymore.
Task-number: QTBUG-61829
Change-Id: I8b2fc00865cce372ca6b5ec75b4775d345d0d18f
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, 2 insertions, 1 deletions
diff --git a/coin/provisioning/common/03-conan.ps1 b/coin/provisioning/common/03-conan.ps1 index 6a4b4ebb..f281e6e0 100644 --- a/coin/provisioning/common/03-conan.ps1 +++ b/coin/provisioning/common/03-conan.ps1 @@ -32,11 +32,12 @@ function Run-Conan-Install $extraArgs = "-s compiler.libcxx=$($CompilerLibcxx)" } + $manifestsDir = "$PSScriptRoot\conan_manifests" + Get-ChildItem -Path "$ConanfilesDir\*.txt" | ForEach-Object { $conanfile = $_.FullName $outpwd = "C:\Utils\conanbuildinfos\$($BuildinfoDir)\$($_.BaseName)" - $manifestsDir = "$($_.DirectoryName)\$($_.BaseName).manifests" New-Item $outpwd -Type directory -Force $process = Start-Process-Logged ` |