aboutsummaryrefslogtreecommitdiff
path: root/scripts
diff options
context:
space:
mode:
authorAlexander Karatarakis <alkarata@microsoft.com>2017-01-23 12:54:33 -0800
committerAlexander Karatarakis <alkarata@microsoft.com>2017-01-23 12:54:33 -0800
commit58aeb684429f107715a1b60500f8e24ea5a95f3c (patch)
tree785f9d1458a0da7c6ab5b7cdae6fc8e7ee0ac590 /scripts
parente6c127511e213a136cd01a40ced59a2b12015428 (diff)
downloadvcpkg-58aeb684429f107715a1b60500f8e24ea5a95f3c.tar.gz
vcpkg-58aeb684429f107715a1b60500f8e24ea5a95f3c.zip
[VS2017] Enable building vcpkg itself with VS2017
Diffstat (limited to 'scripts')
-rw-r--r--scripts/bootstrap.ps15
1 files changed, 4 insertions, 1 deletions
diff --git a/scripts/bootstrap.ps1 b/scripts/bootstrap.ps1
index bcb570b39..a37ed99aa 100644
--- a/scripts/bootstrap.ps1
+++ b/scripts/bootstrap.ps1
@@ -23,7 +23,10 @@ if (!(Test-Path $vcpkgSourcesPath))
try{
pushd $vcpkgSourcesPath
- cmd /c "$env:VS140COMNTOOLS..\..\VC\vcvarsall.bat" x86 "&" msbuild "/p:VCPKG_VERSION=-$gitHash" "/p:DISABLE_METRICS=$disableMetrics" /p:Configuration=Release /p:Platform=x86 /m
+ $msbuildExeWithPlatformToolset = & $scriptsDir\findAnyMSBuildWithCppPlatformToolset.ps1
+ $msbuildExe = $msbuildExeWithPlatformToolset[0]
+ $platformToolset = $msbuildExeWithPlatformToolset[1]
+ & $msbuildExe "/p:VCPKG_VERSION=-$gitHash" "/p:DISABLE_METRICS=$disableMetrics" /p:Configuration=Release /p:Platform=x86 /p:PlatformToolset=$platformToolset /m
Write-Verbose("Placing vcpkg.exe in the correct location")