diff options
| author | Phoebe <20694052+PhoebeHui@users.noreply.github.com> | 2020-07-02 07:58:04 +0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-07-01 16:58:04 -0700 |
| commit | bd2dbb2ce50ecb31ea8206ede7975041cd6d75eb (patch) | |
| tree | 733423bc971c8010f811792b6305753b6aef8700 | |
| parent | 5a9d8011f5c3a954b74d66dc452074e95c90d7db (diff) | |
| download | vcpkg-bd2dbb2ce50ecb31ea8206ede7975041cd6d75eb.tar.gz vcpkg-bd2dbb2ce50ecb31ea8206ede7975041cd6d75eb.zip | |
[vcpkg] Update message in bootstrap.ps1 (#12145)
* [vcpkg] Update message in bootstrap.ps1
* Update docs/users/integration.md
| -rw-r--r-- | docs/users/integration.md | 2 | ||||
| -rw-r--r-- | scripts/bootstrap.ps1 | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/docs/users/integration.md b/docs/users/integration.md index cd5f61e9d..e9a9c42cd 100644 --- a/docs/users/integration.md +++ b/docs/users/integration.md @@ -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. diff --git a/scripts/bootstrap.ps1 b/scripts/bootstrap.ps1 index fdbdf65ac..c062e58da 100644 --- a/scripts/bootstrap.ps1 +++ b/scripts/bootstrap.ps1 @@ -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))" |