From 7bb0224ee152d8ffba7ddf3d07a53d4d39faa1a2 Mon Sep 17 00:00:00 2001 From: Robert Schumacher Date: Mon, 8 May 2017 19:45:39 -0700 Subject: [vcpkg] Use stdfs::equivalent() to correctly compare file paths. Fixes #1053. --- toolsrc/src/VcpkgPaths.cpp | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) (limited to 'toolsrc/src/VcpkgPaths.cpp') diff --git a/toolsrc/src/VcpkgPaths.cpp b/toolsrc/src/VcpkgPaths.cpp index eabdcd410..3dd32de01 100644 --- a/toolsrc/src/VcpkgPaths.cpp +++ b/toolsrc/src/VcpkgPaths.cpp @@ -86,11 +86,13 @@ namespace vcpkg } const fs::path actual_downloaded_path = Strings::trimmed(rc.output); + std::error_code ec; + auto eq = fs::stdfs::equivalent(expected_downloaded_path, actual_downloaded_path, ec); Checks::check_exit(VCPKG_LINE_INFO, - expected_downloaded_path == actual_downloaded_path, + eq && !ec, "Expected dependency downloaded path to be %s, but was %s", - expected_downloaded_path.generic_string(), - actual_downloaded_path.generic_string()); + expected_downloaded_path.u8string(), + actual_downloaded_path.u8string()); return actual_downloaded_path; } -- cgit v1.2.3