From c6bb704ea1e2a2c91605e390900d69bd51269fc9 Mon Sep 17 00:00:00 2001 From: Brad King Date: Tue, 26 Sep 2017 11:51:29 -0400 Subject: cmVSSetupHelper: Fix install location encoding conversion --- Source/cmVSSetupHelper.cxx | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/Source/cmVSSetupHelper.cxx b/Source/cmVSSetupHelper.cxx index d36e350..c414903 100644 --- a/Source/cmVSSetupHelper.cxx +++ b/Source/cmVSSetupHelper.cxx @@ -1,7 +1,9 @@ /* Distributed under the OSI-approved BSD 3-Clause License. See accompanying file Copyright.txt or https://cmake.org/licensing for details. */ #include "cmVSSetupHelper.h" + #include "cmSystemTools.h" +#include "cmsys/Encoding.hxx" #ifndef VSSetupConstants #define VSSetupConstants @@ -51,8 +53,7 @@ const WCHAR* ComponentType = L"Component"; std::string VSInstanceInfo::GetInstallLocation() const { - std::string loc(this->VSInstallLocation.begin(), - this->VSInstallLocation.end()); + std::string loc = cmsys::Encoding::ToNarrow(this->VSInstallLocation); cmSystemTools::ConvertToUnixSlashes(loc); return loc; } -- cgit v0.12