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>
This commit is contained in:
Konstantin Tokarev
2016-10-03 22:32:40 +03:00
parent 433f6dddb5
commit cf257c2869
3 changed files with 12 additions and 5 deletions

View File

@@ -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
}
}

View File

@@ -5,4 +5,5 @@ Run-Conan-Install `
-BuildinfoDir MSVC2015-x86 `
-Arch x86 `
-Compiler "Visual Studio" `
-CompilerVersion 14
-CompilerVersion 14 `
-CompilerRuntime MD

View File

@@ -5,4 +5,5 @@ Run-Conan-Install `
-BuildinfoDir MSVC2015-x86_64 `
-Arch x86_64 `
-Compiler "Visual Studio" `
-CompilerVersion 14
-CompilerVersion 14 `
-CompilerRuntime MD