From 4bf0ba2ba18e0caf2e4e99ab68a1f506a9eb3705 Mon Sep 17 00:00:00 2001 From: Konstantin Tokarev Date: Tue, 16 Jul 2019 02:50:02 +0300 Subject: Provisioning: Add CompilerException and CompilerThreads settings for Conan MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Change-Id: I3a52101056bce4d3d4ac9124dbfd566adf47cf80 Reviewed-by: Mårten Nordheim --- coin/provisioning/common/windows/conan.ps1 | 16 +++++++++++++--- 1 file changed, 13 insertions(+), 3 deletions(-) (limited to 'coin/provisioning') 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" -- cgit v1.2.3