summaryrefslogtreecommitdiffstats
path: root/coin/provisioning/common/conan.ps1
diff options
context:
space:
mode:
authorKonstantin Tokarev <annulen@yandex.ru>2016-11-12 01:58:41 +0300
committerKonstantin Tokarev <annulen@yandex.ru>2016-11-16 21:25:26 +0000
commitf910b2bbf964571014ac4ce193eb8c995c48614d (patch)
tree6f04fbaa3ae3246086ad217bb2bd0ec4d4494b24 /coin/provisioning/common/conan.ps1
parent19c10b941c6f96a0a2845424d8af5d5072d141ab (diff)
Added MinGW support to conan.ps1, and conanfile for MinGW on Win 7
Change-Id: I0442437b33afd0195745a03301440e5eea6d4897 Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
Diffstat (limited to 'coin/provisioning/common/conan.ps1')
-rw-r--r--coin/provisioning/common/conan.ps111
1 files changed, 8 insertions, 3 deletions
diff --git a/coin/provisioning/common/conan.ps1 b/coin/provisioning/common/conan.ps1
index 21f67c73..086af1ec 100644
--- a/coin/provisioning/common/conan.ps1
+++ b/coin/provisioning/common/conan.ps1
@@ -22,11 +22,16 @@ function Run-Conan-Install
[string]$Arch,
[string]$Compiler,
[string]$CompilerVersion,
- [string]$CompilerRuntime
+ [string]$CompilerRuntime,
+ [string]$CompilerLibcxx
)
if ($CompilerRuntime) {
- $runtimeArg = "-s compiler.runtime=$($CompilerRuntime)"
+ $extraArgs = "-s compiler.runtime=$($CompilerRuntime)"
+ }
+
+ if ($CompilerLibcxx) {
+ $extraArgs = "-s compiler.libcxx=$($CompilerLibcxx)"
}
Get-ChildItem -Path "$ConanfilesDir\*.txt" |
@@ -39,7 +44,7 @@ function Run-Conan-Install
-WorkingDirectory $outpwd `
-ArgumentList "install -f $($_.FullName) --verify $($manifestsDir)", `
'-s', ('compiler="' + $Compiler + '"'), `
- "-s os=Windows -s arch=$($Arch) -s compiler.version=$($CompilerVersion) $($runtimeArg)" `
+ "-s os=Windows -s arch=$($Arch) -s compiler.version=$($CompilerVersion) $($extraArgs)" `
-NoNewWindow -Wait -Verbose
}
}