summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKonstantin Tokarev <annulen@yandex.ru>2016-10-03 22:32:40 +0300
committerKonstantin Tokarev <annulen@yandex.ru>2016-10-05 21:25:35 +0000
commitcf257c28694500251f5e193b469d9fd0c2414832 (patch)
treefe06a1e5520a02eff86323ceb9a6762a81903863
parent433f6dddb56d757827643bd1fa7b101a7e179f16 (diff)
Pass compiler.runtime setting to conan
When MSVC is not autodected, necessary setting compiler.runtime has undefined value, breaking installation of packages. This setting is not supported by MinGW, so it should be optional. Task-number: QTQAINFRA-998 Change-Id: Ia1a09eee14275314c160c7c45cd6ab276367dcdb Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
-rw-r--r--coin/provisioning/common/conan.ps111
-rw-r--r--coin/provisioning/qtci-windows-10-x86/conan.ps13
-rw-r--r--coin/provisioning/qtci-windows-10-x86_64/conan.ps13
3 files changed, 12 insertions, 5 deletions
diff --git a/coin/provisioning/common/conan.ps1 b/coin/provisioning/common/conan.ps1
index a4c7ebe4..481aa5f8 100644
--- a/coin/provisioning/common/conan.ps1
+++ b/coin/provisioning/common/conan.ps1
@@ -15,9 +15,14 @@ function Run-Conan-Install
[string]$BuildinfoDir,
[string]$Arch,
[string]$Compiler,
- [string]$CompilerVersion
+ [string]$CompilerVersion,
+ [string]$CompilerRuntime
)
+ if ($CompilerRuntime) {
+ $runtimeArg = "-s compiler.runtime=$($CompilerRuntime)"
+ }
+
Get-ChildItem -Path "$ConanfilesDir\*.txt" |
ForEach-Object {
$outpwd = "C:\Utils\conanbuildinfos\$($BuildinfoDir)\$($_.BaseName)"
@@ -27,7 +32,7 @@ function Run-Conan-Install
-WorkingDirectory $outpwd `
-ArgumentList "install -i -f $($_.FullName)", `
'-s', ('compiler="' + $Compiler + '"'), `
- "-s os=Windows -s arch=$($Arch) -s compiler.version=$($CompilerVersion)" `
- -NoNewWindow -Wait
+ "-s os=Windows -s arch=$($Arch) -s compiler.version=$($CompilerVersion) $($runtimeArg)" `
+ -NoNewWindow -Wait -Verbose
}
}
diff --git a/coin/provisioning/qtci-windows-10-x86/conan.ps1 b/coin/provisioning/qtci-windows-10-x86/conan.ps1
index 718d25de..d5f5f9e2 100644
--- a/coin/provisioning/qtci-windows-10-x86/conan.ps1
+++ b/coin/provisioning/qtci-windows-10-x86/conan.ps1
@@ -5,4 +5,5 @@ Run-Conan-Install `
-BuildinfoDir MSVC2015-x86 `
-Arch x86 `
-Compiler "Visual Studio" `
- -CompilerVersion 14
+ -CompilerVersion 14 `
+ -CompilerRuntime MD
diff --git a/coin/provisioning/qtci-windows-10-x86_64/conan.ps1 b/coin/provisioning/qtci-windows-10-x86_64/conan.ps1
index 04887712..9cf4fbf1 100644
--- a/coin/provisioning/qtci-windows-10-x86_64/conan.ps1
+++ b/coin/provisioning/qtci-windows-10-x86_64/conan.ps1
@@ -5,4 +5,5 @@ Run-Conan-Install `
-BuildinfoDir MSVC2015-x86_64 `
-Arch x86_64 `
-Compiler "Visual Studio" `
- -CompilerVersion 14
+ -CompilerVersion 14 `
+ -CompilerRuntime MD