Provisioning: Add CompilerException and CompilerThreads settings for Conan

Change-Id: I3a52101056bce4d3d4ac9124dbfd566adf47cf80
Reviewed-by: Mårten Nordheim <marten.nordheim@qt.io>

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"