diff options
| author | Brad King <brad.king@kitware.com> | 2013-02-14 15:17:22 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2013-02-14 15:18:31 (GMT) |
| commit | 95a9c80cacea50e2b5d52d67d0a7f5c9b50192dd (patch) | |
| tree | 05d5e8dfb1b303549ba5f3570eb6ec903e95c97f /Source/cmGlobalBorlandMakefileGenerator.cxx | |
| parent | baa33acbdaa3bf88fe1fc591562574ab43b056fe (diff) | |
| parent | 765386279815f208c5f83b1ad2b66776e990feb9 (diff) | |
| download | CMake-95a9c80cacea50e2b5d52d67d0a7f5c9b50192dd.zip CMake-95a9c80cacea50e2b5d52d67d0a7f5c9b50192dd.tar.gz CMake-95a9c80cacea50e2b5d52d67d0a7f5c9b50192dd.tar.bz2 | |
Merge topic 'LINK_LIBRARIES-property' into rpath-use-implicit-link-dirs
Resolve a logical conflict in the signature of cmTarget::GetLinkClosure.
Diffstat (limited to 'Source/cmGlobalBorlandMakefileGenerator.cxx')
| -rw-r--r-- | Source/cmGlobalBorlandMakefileGenerator.cxx | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Source/cmGlobalBorlandMakefileGenerator.cxx b/Source/cmGlobalBorlandMakefileGenerator.cxx index 8c6787a..2a7d61d 100644 --- a/Source/cmGlobalBorlandMakefileGenerator.cxx +++ b/Source/cmGlobalBorlandMakefileGenerator.cxx @@ -55,9 +55,9 @@ cmLocalGenerator *cmGlobalBorlandMakefileGenerator::CreateLocalGenerator() //---------------------------------------------------------------------------- void cmGlobalBorlandMakefileGenerator -::GetDocumentation(cmDocumentationEntry& entry) const +::GetDocumentation(cmDocumentationEntry& entry) { - entry.Name = this->GetName(); + entry.Name = cmGlobalBorlandMakefileGenerator::GetActualName(); entry.Brief = "Generates Borland makefiles."; entry.Full = ""; } |