summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBrad King <brad.king@kitware.com>2010-07-20 19:59:34 (GMT)
committerCMake Topic Stage <kwrobot@kitware.com>2010-07-20 19:59:34 (GMT)
commitefb2c1e6957fa90420ef051d76a17f0b1230c901 (patch)
treeaa9521f0f4f8748433c62f782977afc80d329c01
parent8ef066eea412b52e0dd063a06220a5eb55d9f5c5 (diff)
parent8507a73ea6e394b6ad42b7a2df562ee7b4bd4950 (diff)
downloadCMake-efb2c1e6957fa90420ef051d76a17f0b1230c901.zip
CMake-efb2c1e6957fa90420ef051d76a17f0b1230c901.tar.gz
CMake-efb2c1e6957fa90420ef051d76a17f0b1230c901.tar.bz2
Merge topic 'guid_vs_newname'
8507a73 Fix for bug#10483, INCLUDE_EXTERNAL_MSPROJECT: ProjectGUID now ProjectGuid
-rw-r--r--Source/cmLocalVisualStudio10Generator.cxx2
1 files changed, 1 insertions, 1 deletions
diff --git a/Source/cmLocalVisualStudio10Generator.cxx b/Source/cmLocalVisualStudio10Generator.cxx
index 8df0ffa..57d8653 100644
--- a/Source/cmLocalVisualStudio10Generator.cxx
+++ b/Source/cmLocalVisualStudio10Generator.cxx
@@ -37,7 +37,7 @@ class cmVS10XMLParser : public cmXMLParser
{
return;
}
- if(strcmp("ProjectGUID", name) == 0)
+ if(strcmp("ProjectGUID", name) == 0 || strcmp("ProjectGuid", name) == 0)
{
this->DoGUID = true;
}