cmVSSetupHelper: Fix install location encoding conversion

This commit is contained in:
Brad King
2017-09-26 11:51:29 -04:00
parent 4c3116d754
commit c6bb704ea1
+3 -2
View File
@@ -1,7 +1,9 @@
/* Distributed under the OSI-approved BSD 3-Clause License. See accompanying /* Distributed under the OSI-approved BSD 3-Clause License. See accompanying
file Copyright.txt or https://cmake.org/licensing for details. */ file Copyright.txt or https://cmake.org/licensing for details. */
#include "cmVSSetupHelper.h" #include "cmVSSetupHelper.h"
#include "cmSystemTools.h" #include "cmSystemTools.h"
#include "cmsys/Encoding.hxx"
#ifndef VSSetupConstants #ifndef VSSetupConstants
#define VSSetupConstants #define VSSetupConstants
@@ -51,8 +53,7 @@ const WCHAR* ComponentType = L"Component";
std::string VSInstanceInfo::GetInstallLocation() const std::string VSInstanceInfo::GetInstallLocation() const
{ {
std::string loc(this->VSInstallLocation.begin(), std::string loc = cmsys::Encoding::ToNarrow(this->VSInstallLocation);
this->VSInstallLocation.end());
cmSystemTools::ConvertToUnixSlashes(loc); cmSystemTools::ConvertToUnixSlashes(loc);
return loc; return loc;
} }