diff options
| author | Robert Schumacher <roschuma@microsoft.com> | 2017-08-29 18:58:01 -0700 |
|---|---|---|
| committer | Robert Schumacher <roschuma@microsoft.com> | 2017-08-29 18:58:01 -0700 |
| commit | e0a9cae9283b78f4470479d0001ea058cc655789 (patch) | |
| tree | f7feb7029312e195da3748ce6bed1516ffd17134 /toolsrc/src/VcpkgPaths.cpp | |
| parent | 526b1436a16b5c60760cbfc16a7f64e49cf13a01 (diff) | |
| parent | 5b42ec9b5d7277d9a4452c4c3a109770d9437205 (diff) | |
| download | vcpkg-e0a9cae9283b78f4470479d0001ea058cc655789.tar.gz vcpkg-e0a9cae9283b78f4470479d0001ea058cc655789.zip | |
Merge branch 'utf-1702'
Diffstat (limited to 'toolsrc/src/VcpkgPaths.cpp')
| -rw-r--r-- | toolsrc/src/VcpkgPaths.cpp | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/toolsrc/src/VcpkgPaths.cpp b/toolsrc/src/VcpkgPaths.cpp index 1a8693efc..1fe92014c 100644 --- a/toolsrc/src/VcpkgPaths.cpp +++ b/toolsrc/src/VcpkgPaths.cpp @@ -264,7 +264,14 @@ namespace vcpkg const std::wstring cmd = System::create_powershell_script_cmd(script); System::ExitCodeAndOutput ec_data = System::cmd_execute_and_capture_output(cmd); Checks::check_exit(VCPKG_LINE_INFO, ec_data.exit_code == 0, "Could not run script to detect VS 2017 instances"); - return Strings::split(ec_data.output, "\n"); + return Util::fmap(Strings::split(ec_data.output, "\n"), [](const std::string& line) { + auto colon_pos = line.find(':'); + if (colon_pos != std::string::npos && colon_pos > 0) + { + return line.substr(colon_pos - 1); + } + return line; + }); } static Optional<fs::path> get_VS2015_installation_instance() |
