[vcpkg] Update message in bootstrap.ps1 (#12145)

* [vcpkg] Update message in bootstrap.ps1

* Update docs/users/integration.md
This commit is contained in:
Phoebe 2020-07-02 07:58:04 +08:00 committed by GitHub
parent 5a9d8011f5
commit bd2dbb2ce5
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 2 additions and 2 deletions

View File

@ -17,7 +17,7 @@ These link your project(s) to a specific copy of Vcpkg on your machine so any up
```no-highlight
vcpkg integrate install
```
This will implicitly add Include Directories, Link Directories, and Link Libraries for all packages installed with Vcpkg to all VS2015 and VS2017 MSBuild projects. We also add a post-build action for executable projects that will analyze and copy any DLLs you need to the output folder, enabling a seamless F5 experience.
This will implicitly add Include Directories, Link Directories, and Link Libraries for all packages installed with Vcpkg to all VS2015, VS2017 and VS2019 MSBuild projects. We also add a post-build action for executable projects that will analyze and copy any DLLs you need to the output folder, enabling a seamless F5 experience.
For the vast majority of libraries, this is all you need to do -- just File -> New Project and write code! However, some libraries perform conflicting behaviors such as redefining `main()`. Since you need to choose per-project which of these conflicting options you want, you will need to add those libraries to your linker inputs manually.

View File

@ -140,7 +140,7 @@ function findAnyMSBuildWithCppPlatformToolset([string]$withVSPath)
$VisualStudioInstances = getVisualStudioInstances
if ($null -eq $VisualStudioInstances)
{
throw "Could not find Visual Studio. VS2015 or VS2017 (with C++) needs to be installed."
throw "Could not find Visual Studio. VS2015, VS2017, or VS2019 (with C++) needs to be installed."
}
Write-Verbose "VS Candidates:`n`r$([system.String]::Join([Environment]::NewLine, $VisualStudioInstances))"