diff options
| author | Robert Schumacher <roschuma@microsoft.com> | 2018-05-03 15:03:35 -0700 |
|---|---|---|
| committer | Robert Schumacher <roschuma@microsoft.com> | 2018-05-03 15:03:35 -0700 |
| commit | 8f0ebdf8d561ef8402db44cd9abb2c912cff276d (patch) | |
| tree | e2ad3858d36ada9c11d56aff73071ed233bc72b0 /toolsrc/src/vcpkg.cpp | |
| parent | 6ec3a486332bd50500decee0aeaa166fa37ba8d2 (diff) | |
| download | vcpkg-8f0ebdf8d561ef8402db44cd9abb2c912cff276d.tar.gz vcpkg-8f0ebdf8d561ef8402db44cd9abb2c912cff276d.zip | |
[vcpkg] Remove utf16 usage from non-Windows
Diffstat (limited to 'toolsrc/src/vcpkg.cpp')
| -rw-r--r-- | toolsrc/src/vcpkg.cpp | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/toolsrc/src/vcpkg.cpp b/toolsrc/src/vcpkg.cpp index 06c99e9a8..ac2eec876 100644 --- a/toolsrc/src/vcpkg.cpp +++ b/toolsrc/src/vcpkg.cpp @@ -70,7 +70,7 @@ static void inner(const VcpkgCmdArguments& args) fs::path vcpkg_root_dir; if (args.vcpkg_root_dir != nullptr) { - vcpkg_root_dir = fs::stdfs::absolute(Strings::to_utf16(*args.vcpkg_root_dir)); + vcpkg_root_dir = fs::stdfs::absolute(fs::u8path(*args.vcpkg_root_dir)); } else { @@ -94,6 +94,8 @@ static void inner(const VcpkgCmdArguments& args) Checks::check_exit(VCPKG_LINE_INFO, !vcpkg_root_dir.empty(), "Error: Could not detect vcpkg-root."); + Debug::println("Using vcpkg-root: %s", vcpkg_root_dir.u8string()); + auto default_vs_path = System::get_environment_variable("VCPKG_DEFAULT_VS_PATH").value_or(""); const Expected<VcpkgPaths> expected_paths = VcpkgPaths::create(vcpkg_root_dir, default_vs_path); |