lili/qt5
1
0
Fork 0
mirror of git://code.qt.io/qt/qt5.git synced 2026-05-01 08:57:32 +08:00
Code Issues Packages Projects Releases Wiki Activity

Provisioning: Add CompilerException and CompilerThreads settings for Conan

Browse Source 
Change-Id: I3a52101056bce4d3d4ac9124dbfd566adf47cf80
Reviewed-by: Mårten Nordheim <marten.nordheim@qt.io>
This commit is contained in:
Konstantin Tokarev
2019-07-16 02:50:02 +03:00
parent 2666f3b216
commit 4bf0ba2ba1
1 changed files with 13 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
coin/provisioning/common/windows/conan.ps1
View File

@@ -18,15 +18,25 @@ function Run-Conan-Install
[string]$Compiler, [string]$Compiler,
[string]$CompilerVersion, [string]$CompilerVersion,
[string]$CompilerRuntime, [string]$CompilerRuntime,
[string]$CompilerLibcxx [string]$CompilerLibcxx,
[string]$CompilerException,
[string]$CompilerThreads
) )
if ($CompilerRuntime) { if ($CompilerRuntime) {
$extraArgs = "-s compiler.runtime=$($CompilerRuntime)" $extraArgs += " -s compiler.runtime=$CompilerRuntime"
} }
if ($CompilerLibcxx) { if ($CompilerLibcxx) {
$extraArgs = "-s compiler.libcxx=$($CompilerLibcxx)" $extraArgs += " -s compiler.libcxx=$CompilerLibcxx"
}
if ($CompilerException) {
$extraArgs += " -s compiler.exception=$CompilerException"
}
if ($CompilerThreads) {
$extraArgs += " -s compiler.threads=$CompilerThreads"
} }
$manifestsDir = "$PSScriptRoot\conan_manifests" $manifestsDir = "$PSScriptRoot\conan_manifests"