Merge topic 'msvc-encoding'

58e3d49 MSVC: Fix encoding of Visual Studio 10+ project files.
This commit is contained in:
Brad King 2013-11-14 11:28:19 -05:00 committed by CMake Topic Stage
commit bd082a29a9
1 changed files with 4 additions and 2 deletions

View File

@ -219,7 +219,8 @@ void cmVisualStudio10TargetGenerator::Generate()
//get the tools version to use //get the tools version to use
const std::string toolsVer(this->GlobalGenerator->GetToolsVersion()); const std::string toolsVer(this->GlobalGenerator->GetToolsVersion());
std::string project_defaults="<?xml version=\"1.0\" encoding=\"utf-8\"?>\n"; std::string project_defaults=
"<?xml version=\"1.0\" encoding=\"Windows-1252\"?>\n";
project_defaults.append("<Project DefaultTargets=\"Build\" ToolsVersion=\""); project_defaults.append("<Project DefaultTargets=\"Build\" ToolsVersion=\"");
project_defaults.append(toolsVer +"\" "); project_defaults.append(toolsVer +"\" ");
project_defaults.append( project_defaults.append(
@ -724,7 +725,8 @@ void cmVisualStudio10TargetGenerator::WriteGroups()
//get the tools version to use //get the tools version to use
const std::string toolsVer(this->GlobalGenerator->GetToolsVersion()); const std::string toolsVer(this->GlobalGenerator->GetToolsVersion());
std::string project_defaults="<?xml version=\"1.0\" encoding=\"utf-8\"?>\n"; std::string project_defaults=
"<?xml version=\"1.0\" encoding=\"Windows-1252\"?>\n";
project_defaults.append("<Project ToolsVersion=\""); project_defaults.append("<Project ToolsVersion=\"");
project_defaults.append(toolsVer +"\" "); project_defaults.append(toolsVer +"\" ");
project_defaults.append( project_defaults.append(