diff options
| author | Robert Schumacher <roschuma@microsoft.com> | 2018-09-19 18:41:28 -0700 |
|---|---|---|
| committer | Robert Schumacher <roschuma@microsoft.com> | 2018-09-19 18:41:28 -0700 |
| commit | 48ec8f295061ae02d8e22dde60c445c99baac79e (patch) | |
| tree | 2c2a587c32344277bbfd81eb5670b11c524fa885 /toolsrc/include | |
| parent | 64a7483a4a4c9d176896ec7aec08a6acef4ea8f3 (diff) | |
| parent | 1faf5c7d289f5b693fbcaa98af8b41833e6a5a04 (diff) | |
| download | vcpkg-48ec8f295061ae02d8e22dde60c445c99baac79e.tar.gz vcpkg-48ec8f295061ae02d8e22dde60c445c99baac79e.zip | |
Merge remote-tracking branch 'origin/master' into dev/roschuma/upgrades
Diffstat (limited to 'toolsrc/include')
| -rw-r--r-- | toolsrc/include/vcpkg/commands.h | 6 | ||||
| -rw-r--r-- | toolsrc/include/vcpkg/visualstudio.h | 2 |
2 files changed, 8 insertions, 0 deletions
diff --git a/toolsrc/include/vcpkg/commands.h b/toolsrc/include/vcpkg/commands.h index 1858a320f..fd7d832b3 100644 --- a/toolsrc/include/vcpkg/commands.h +++ b/toolsrc/include/vcpkg/commands.h @@ -119,6 +119,12 @@ namespace vcpkg::Commands void perform_and_exit(const VcpkgCmdArguments& args); } + namespace X_VSInstances + { + extern const CommandStructure COMMAND_STRUCTURE; + void perform_and_exit(const VcpkgCmdArguments& args, const VcpkgPaths& paths); + } + namespace Hash { void perform_and_exit(const VcpkgCmdArguments& args, const VcpkgPaths& paths); diff --git a/toolsrc/include/vcpkg/visualstudio.h b/toolsrc/include/vcpkg/visualstudio.h index b93b145d9..cd99db352 100644 --- a/toolsrc/include/vcpkg/visualstudio.h +++ b/toolsrc/include/vcpkg/visualstudio.h @@ -6,6 +6,8 @@ namespace vcpkg::VisualStudio
{
+ std::vector<std::string> get_visual_studio_instances(const VcpkgPaths& paths);
+
std::vector<Toolset> find_toolset_instances_preferred_first(const VcpkgPaths& paths);
}
|