summaryrefslogtreecommitdiffstats
path: root/Source/cmGlobalMSYSMakefileGenerator.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/cmGlobalMSYSMakefileGenerator.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/cmGlobalMSYSMakefileGenerator.cxx')
-rw-r--r--Source/cmGlobalMSYSMakefileGenerator.cxx4
1 files changed, 2 insertions, 2 deletions
diff --git a/Source/cmGlobalMSYSMakefileGenerator.cxx b/Source/cmGlobalMSYSMakefileGenerator.cxx
index 80526aa..d49639b 100644
--- a/Source/cmGlobalMSYSMakefileGenerator.cxx
+++ b/Source/cmGlobalMSYSMakefileGenerator.cxx
@@ -106,9 +106,9 @@ cmLocalGenerator *cmGlobalMSYSMakefileGenerator::CreateLocalGenerator()
//----------------------------------------------------------------------------
void cmGlobalMSYSMakefileGenerator
-::GetDocumentation(cmDocumentationEntry& entry) const
+::GetDocumentation(cmDocumentationEntry& entry)
{
- entry.Name = this->GetName();
+ entry.Name = cmGlobalMSYSMakefileGenerator::GetActualName();
entry.Brief = "Generates MSYS makefiles.";
entry.Full = "The makefiles use /bin/sh as the shell. "
"They require msys to be installed on the machine.";