summaryrefslogtreecommitdiffstats
path: root/Source/cmGlobalVisualStudio6Generator.cxx
diff options
context:
space:
mode:
authorMorné Chamberlain <thefreeman.za@gmail.com>2012-11-24 18:23:55 (GMT)
committerMorné Chamberlain <thefreeman.za@gmail.com>2012-11-24 18:23:55 (GMT)
commitb3ae61f8338fd3b2308de0173c34a329ba46d191 (patch)
tree72c3a159ba5f430a920ebe04057e383f8b155ec1 /Source/cmGlobalVisualStudio6Generator.cxx
parent089d9ccdce530ebd08dfc4681833cefeff4a7eb9 (diff)
parent79357448ceac5a8657c5be25bd3f02cd3345b934 (diff)
downloadCMake-b3ae61f8338fd3b2308de0173c34a329ba46d191.zip
CMake-b3ae61f8338fd3b2308de0173c34a329ba46d191.tar.gz
CMake-b3ae61f8338fd3b2308de0173c34a329ba46d191.tar.bz2
Merge branch 'master' into sublime-text-2-generator
Diffstat (limited to 'Source/cmGlobalVisualStudio6Generator.cxx')
-rw-r--r--Source/cmGlobalVisualStudio6Generator.cxx5
1 files changed, 2 insertions, 3 deletions
diff --git a/Source/cmGlobalVisualStudio6Generator.cxx b/Source/cmGlobalVisualStudio6Generator.cxx
index e8ca788..cb15c30 100644
--- a/Source/cmGlobalVisualStudio6Generator.cxx
+++ b/Source/cmGlobalVisualStudio6Generator.cxx
@@ -200,7 +200,6 @@ void cmGlobalVisualStudio6Generator
tt != orderedProjectTargets.end(); ++tt)
{
cmTarget* target = *tt;
- cmMakefile* mf = target->GetMakefile();
// Write the project into the DSW file
const char* expath = target->GetProperty("EXTERNAL_MSPROJECT");
if(expath)
@@ -398,9 +397,9 @@ cmGlobalVisualStudio6Generator::WriteUtilityDepend(cmTarget* target)
//----------------------------------------------------------------------------
void cmGlobalVisualStudio6Generator
-::GetDocumentation(cmDocumentationEntry& entry) const
+::GetDocumentation(cmDocumentationEntry& entry)
{
- entry.Name = this->GetName();
+ entry.Name = cmGlobalVisualStudio6Generator::GetActualName();
entry.Brief = "Generates Visual Studio 6 project files.";
entry.Full = "";
}