aboutsummaryrefslogtreecommitdiff
path: root/scripts
diff options
context:
space:
mode:
authorAlexander Karatarakis <alkarata@microsoft.com>2017-11-09 20:09:04 -0800
committerAlexander Karatarakis <alkarata@microsoft.com>2017-11-09 20:09:22 -0800
commit615f7e112f38cf82dd1cec9d519501938f755324 (patch)
tree45c835d102a25bbe6de3e4e2c31dd10f57ddd543 /scripts
parenteabacf0d14b288f8d8a530cbefce09f7e26aa981 (diff)
downloadvcpkg-615f7e112f38cf82dd1cec9d519501938f755324.tar.gz
vcpkg-615f7e112f38cf82dd1cec9d519501938f755324.zip
[bootstrap.ps1] Add option to specify VS path
Diffstat (limited to 'scripts')
-rw-r--r--scripts/bootstrap.ps16
1 files changed, 3 insertions, 3 deletions
diff --git a/scripts/bootstrap.ps1 b/scripts/bootstrap.ps1
index b14dbbe4a..f8e6dcaa0 100644
--- a/scripts/bootstrap.ps1
+++ b/scripts/bootstrap.ps1
@@ -1,7 +1,7 @@
[CmdletBinding()]
param(
- [ValidateNotNullOrEmpty()]
- [string]$disableMetrics = "0"
+ [ValidateNotNullOrEmpty()][string]$disableMetrics = "0",
+ [Parameter(Mandatory=$False)][string]$explicitlyRequestedVSPath = ""
)
$scriptsDir = split-path -parent $MyInvocation.MyCommand.Definition
@@ -39,7 +39,7 @@ if (!(Test-Path $vcpkgSourcesPath))
try
{
pushd $vcpkgSourcesPath
- $msbuildExeWithPlatformToolset = & $scriptsDir\findAnyMSBuildWithCppPlatformToolset.ps1
+ $msbuildExeWithPlatformToolset = & $scriptsDir\findAnyMSBuildWithCppPlatformToolset.ps1 $explicitlyRequestedVSPath
$msbuildExe = $msbuildExeWithPlatformToolset[0]
$platformToolset = $msbuildExeWithPlatformToolset[1]
$windowsSDK = & $scriptsDir\getWindowsSDK.ps1