mirror of
git://code.qt.io/qt/qt5.git
synced 2026-04-21 04:16:39 +08:00
Added MinGW support to conan.ps1, and conanfile for MinGW on Win 7
Change-Id: I0442437b33afd0195745a03301440e5eea6d4897 Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
This commit is contained in:
@@ -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
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user