dilim/CMake
1
0
Fork 0
mirror of https://github.com/Kitware/CMake.git synced 2026-08-08 00:30:48 +00:00
Code Issues Packages Projects Releases Wiki Activity

VS: Fix .vcxproj ProjectGuid element case

Browse Source 
The `.vcxproj` file format expects `ProjectGuid`, not `ProjectGUID`.
The latter is expected by `.vcproj` files from VS 2008, so this was
likely a typo when the VS 2010 generator was first introduced.

Fixes: #11968
This commit is contained in:
Brad King
2017-05-09 10:12:12 -04:00
parent 22d0a83a4c
commit 776929b3c4
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
Source/cmGlobalVisualStudio10Generator.cxx
View File

@@ -647,9 +647,9 @@ bool cmGlobalVisualStudio10Generator::FindVCTargetsPath(cmMakefile* mf)
xw.EndElement(); // ItemGroup xw.EndElement(); // ItemGroup
xw.StartElement("PropertyGroup"); xw.StartElement("PropertyGroup");
xw.Attribute("Label", "Globals"); xw.Attribute("Label", "Globals");
xw.StartElement("ProjectGUID"); xw.StartElement("ProjectGuid");
xw.Content("{F3FC6D86-508D-3FB1-96D2-995F08B142EC}"); xw.Content("{F3FC6D86-508D-3FB1-96D2-995F08B142EC}");
xw.EndElement(); // ProjectGUID xw.EndElement(); // ProjectGuid
xw.StartElement("Keyword"); xw.StartElement("Keyword");
xw.Content("Win32Proj"); xw.Content("Win32Proj");
xw.EndElement(); // Keyword xw.EndElement(); // Keyword

4
Source/cmVisualStudio10TargetGenerator.cxx
View File

@@ -297,8 +297,8 @@ void cmVisualStudio10TargetGenerator::Generate()
this->WriteProjectConfigurations(); this->WriteProjectConfigurations();
} }
this->WriteString("<PropertyGroup Label=\"Globals\">\n", 1); this->WriteString("<PropertyGroup Label=\"Globals\">\n", 1);
this->WriteString("<ProjectGUID>", 2); this->WriteString("<ProjectGuid>", 2);
(*this->BuildFileStream) << "{" << this->GUID << "}</ProjectGUID>\n"; (*this->BuildFileStream) << "{" << this->GUID << "}</ProjectGuid>\n";
if (this->MSTools && if (this->MSTools &&
this->GeneratorTarget->GetType() <= cmStateEnums::GLOBAL_TARGET) { this->GeneratorTarget->GetType() <= cmStateEnums::GLOBAL_TARGET) {