diff options
author | Konstantin Tokarev <annulen@yandex.ru> | 2019-07-16 02:50:02 +0300 |
---|---|---|
committer | Konstantin Tokarev <annulen@yandex.ru> | 2019-07-26 19:52:37 +0300 |
commit | 4bf0ba2ba18e0caf2e4e99ab68a1f506a9eb3705 (patch) | |
tree | 4c250975fe04451582dbfd2a9a0e982bdfad3445 /coin/provisioning | |
parent | 2666f3b21609e0e22ffd1bbeead3ff91b8b0ca93 (diff) | |
download | qt5-4bf0ba2ba18e0caf2e4e99ab68a1f506a9eb3705.tar.gz |
Provisioning: Add CompilerException and CompilerThreads settings for Conan
Change-Id: I3a52101056bce4d3d4ac9124dbfd566adf47cf80
Reviewed-by: Mårten Nordheim <marten.nordheim@qt.io>
Diffstat (limited to 'coin/provisioning')
-rw-r--r-- | coin/provisioning/common/windows/conan.ps1 | 16 |
1 files changed, 13 insertions, 3 deletions
diff --git a/coin/provisioning/common/windows/conan.ps1 b/coin/provisioning/common/windows/conan.ps1 index 15a1aaca..d440804e 100644 --- a/coin/provisioning/common/windows/conan.ps1 +++ b/coin/provisioning/common/windows/conan.ps1 @@ -18,15 +18,25 @@ function Run-Conan-Install [string]$Compiler, [string]$CompilerVersion, [string]$CompilerRuntime, - [string]$CompilerLibcxx + [string]$CompilerLibcxx, + [string]$CompilerException, + [string]$CompilerThreads ) if ($CompilerRuntime) { - $extraArgs = "-s compiler.runtime=$($CompilerRuntime)" + $extraArgs += " -s compiler.runtime=$CompilerRuntime" } 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" |