diff options
| author | Alexander Karatarakis <alkarata@microsoft.com> | 2017-11-20 19:15:47 -0800 |
|---|---|---|
| committer | Alexander Karatarakis <alkarata@microsoft.com> | 2017-11-20 19:15:47 -0800 |
| commit | 786d53c002c044e9340e43070b393d69e14e78be (patch) | |
| tree | d2d05604063db8b9d6303be548942c5008963138 | |
| parent | 7c07ff813b0528fdd37f8835b99bc2e449fcf10c (diff) | |
| download | vcpkg-786d53c002c044e9340e43070b393d69e14e78be.tar.gz vcpkg-786d53c002c044e9340e43070b393d69e14e78be.zip | |
Fix `vcpkg integrate install` for unicode usernames
| -rw-r--r-- | toolsrc/include/vcpkg/base/files.h | 1 | ||||
| -rw-r--r-- | toolsrc/src/vcpkg/commands.integrate.cpp | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/toolsrc/include/vcpkg/base/files.h b/toolsrc/include/vcpkg/base/files.h index 63cf3c6fd..51a12ceba 100644 --- a/toolsrc/include/vcpkg/base/files.h +++ b/toolsrc/include/vcpkg/base/files.h @@ -15,6 +15,7 @@ namespace fs using stdfs::copy_options; using stdfs::file_status; using stdfs::path; + using stdfs::u8path; inline bool is_regular_file(file_status s) { return stdfs::is_regular_file(s); } inline bool is_directory(file_status s) { return stdfs::is_directory(s); } diff --git a/toolsrc/src/vcpkg/commands.integrate.cpp b/toolsrc/src/vcpkg/commands.integrate.cpp index 31b9ec722..f13a999fa 100644 --- a/toolsrc/src/vcpkg/commands.integrate.cpp +++ b/toolsrc/src/vcpkg/commands.integrate.cpp @@ -139,7 +139,7 @@ namespace vcpkg::Commands::Integrate static fs::path get_appdata_targets_path() { static const fs::path LOCAL_APP_DATA = - fs::path(System::get_environment_variable("LOCALAPPDATA").value_or_exit(VCPKG_LINE_INFO)); + fs::u8path(System::get_environment_variable("LOCALAPPDATA").value_or_exit(VCPKG_LINE_INFO)); return LOCAL_APP_DATA / "vcpkg" / "vcpkg.user.targets"; } #endif |