mirror of
https://github.com/microsoft/vcpkg.git
synced 2024-12-27 18:31:15 +08:00
[vcpkg] Enable bootstrapping with VS2019
This commit is contained in:
parent
397e1a5d6c
commit
fd56ffcf5c
@ -166,7 +166,7 @@ function findAnyMSBuildWithCppPlatformToolset([string]$withVSPath)
|
||||
if (Test-Path $VCFolder)
|
||||
{
|
||||
Write-Verbose "Picking: $instanceCandidate"
|
||||
return "$path\MSBuild\Current\Bin\MSBuild.exe", "v141"
|
||||
return "$path\MSBuild\Current\Bin\MSBuild.exe", "v142"
|
||||
}
|
||||
}
|
||||
|
||||
@ -192,7 +192,7 @@ function findAnyMSBuildWithCppPlatformToolset([string]$withVSPath)
|
||||
}
|
||||
}
|
||||
|
||||
throw "Could not find MSBuild version with C++ support. VS2015 or VS2017 (with C++) needs to be installed."
|
||||
throw "Could not find MSBuild version with C++ support. VS2015, VS2017, or VS2019 (with C++) needs to be installed."
|
||||
}
|
||||
function getWindowsSDK( [Parameter(Mandatory=$False)][switch]$DisableWin10SDK = $False,
|
||||
[Parameter(Mandatory=$False)][switch]$DisableWin81SDK = $False,
|
||||
@ -396,7 +396,7 @@ if ($ec -ne 0)
|
||||
}
|
||||
Write-Host "`nBuilding vcpkg.exe... done.`n"
|
||||
|
||||
Write-Verbose("Placing vcpkg.exe in the correct location")
|
||||
Write-Verbose "Placing vcpkg.exe in the correct location"
|
||||
|
||||
Copy-Item "$vcpkgReleaseDir\vcpkg.exe" "$vcpkgRootDir\vcpkg.exe"
|
||||
Copy-Item "$vcpkgReleaseDir\vcpkgmetricsuploader.exe" "$vcpkgRootDir\scripts\vcpkgmetricsuploader.exe"
|
||||
|
Loading…
x
Reference in New Issue
Block a user