diff options
author | Brad King <brad.king@kitware.com> | 2017-05-10 13:27:04 (GMT) |
---|---|---|
committer | Kitware Robot <kwrobot@kitware.com> | 2017-05-10 13:27:10 (GMT) |
commit | d43eb3aec2419284c8491b0f8334ca47d0a6e334 (patch) | |
tree | b7cb5b171604455fd75ac32bb2537079152d3efc /Source | |
parent | 882ef5f33f75b5315fe471a1b58a8c07c2b57dec (diff) | |
parent | 776929b3c46ef593fc70cf792e0f4e99d6bc88b9 (diff) | |
download | CMake-d43eb3aec2419284c8491b0f8334ca47d0a6e334.zip CMake-d43eb3aec2419284c8491b0f8334ca47d0a6e334.tar.gz CMake-d43eb3aec2419284c8491b0f8334ca47d0a6e334.tar.bz2 |
Merge topic 'vs-project-guid'
776929b3 VS: Fix .vcxproj ProjectGuid element case
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !817
Diffstat (limited to 'Source')
-rw-r--r-- | Source/cmGlobalVisualStudio10Generator.cxx | 4 | ||||
-rw-r--r-- | Source/cmVisualStudio10TargetGenerator.cxx | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/Source/cmGlobalVisualStudio10Generator.cxx b/Source/cmGlobalVisualStudio10Generator.cxx index ee9e47a..0e02b0a 100644 --- a/Source/cmGlobalVisualStudio10Generator.cxx +++ b/Source/cmGlobalVisualStudio10Generator.cxx @@ -647,9 +647,9 @@ bool cmGlobalVisualStudio10Generator::FindVCTargetsPath(cmMakefile* mf) xw.EndElement(); // ItemGroup xw.StartElement("PropertyGroup"); xw.Attribute("Label", "Globals"); - xw.StartElement("ProjectGUID"); + xw.StartElement("ProjectGuid"); xw.Content("{F3FC6D86-508D-3FB1-96D2-995F08B142EC}"); - xw.EndElement(); // ProjectGUID + xw.EndElement(); // ProjectGuid xw.StartElement("Keyword"); xw.Content("Win32Proj"); xw.EndElement(); // Keyword diff --git a/Source/cmVisualStudio10TargetGenerator.cxx b/Source/cmVisualStudio10TargetGenerator.cxx index c81ba7a..4fcf5dc 100644 --- a/Source/cmVisualStudio10TargetGenerator.cxx +++ b/Source/cmVisualStudio10TargetGenerator.cxx @@ -297,8 +297,8 @@ void cmVisualStudio10TargetGenerator::Generate() this->WriteProjectConfigurations(); } this->WriteString("<PropertyGroup Label=\"Globals\">\n", 1); - this->WriteString("<ProjectGUID>", 2); - (*this->BuildFileStream) << "{" << this->GUID << "}</ProjectGUID>\n"; + this->WriteString("<ProjectGuid>", 2); + (*this->BuildFileStream) << "{" << this->GUID << "}</ProjectGuid>\n"; if (this->MSTools && this->GeneratorTarget->GetType() <= cmStateEnums::GLOBAL_TARGET) { |