[Cmake-commits] CMake branch, master, updated. d62c51ddc2f706b6c653e6df51f5a336cbb45352
cmake-commits at cmake.org
cmake-commits at cmake.org
Sat May 8 04:13:30 EDT 2010
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "CMake".
The branch, master has been updated
via d62c51ddc2f706b6c653e6df51f5a336cbb45352 (commit)
from d1b3ceb88c3fd37441fa504059f4b3bd84a0c322 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=d62c51ddc2f706b6c653e6df51f5a336cbb45352
commit d62c51ddc2f706b6c653e6df51f5a336cbb45352
Author: Alex Neundorf <neundorf at kde.org>
Date: Sat May 8 10:10:19 2010 +0200
-fix documentation from a module which has *only* documentation
This is #10466. It didn't crash for me, but also didn't work.
The issue was that a line ending with something else than a # was considered as the
end of the documentation block. If there was simply the end of the file we didn't
get into the correct branch.
Alex
diff --git a/Source/cmDocumentation.cxx b/Source/cmDocumentation.cxx
index 1dfc784..bfe11c1 100644
--- a/Source/cmDocumentation.cxx
+++ b/Source/cmDocumentation.cxx
@@ -606,20 +606,22 @@ bool cmDocumentation::CreateSingleModule(const char* fname,
}
else
{
- if(text.length() < 2 && brief.length() == 1)
- {
- return false;
- }
- char* pname = strcpy(new char[strlen(moduleName)+1], moduleName);
- char* ptext = strcpy(new char[text.length()+1], text.c_str());
- this->ModuleStrings.push_back(pname);
- this->ModuleStrings.push_back(ptext);
- char* pbrief = strcpy(new char[brief.length()+1], brief.c_str());
- this->ModuleStrings.push_back(pbrief);
- moduleSection.Append(pname, pbrief, ptext);
- return true;
+ break;
}
}
+
+ if(text.length() < 2 && brief.length() == 1)
+ {
+ return false;
+ }
+
+ char* pname = strcpy(new char[strlen(moduleName)+1], moduleName);
+ char* ptext = strcpy(new char[text.length()+1], text.c_str());
+ this->ModuleStrings.push_back(pname);
+ this->ModuleStrings.push_back(ptext);
+ char* pbrief = strcpy(new char[brief.length()+1], brief.c_str());
+ this->ModuleStrings.push_back(pbrief);
+ moduleSection.Append(pname, pbrief, ptext);
return true;
}
-----------------------------------------------------------------------
Summary of changes:
Source/cmDocumentation.cxx | 26 ++++++++++++++------------
1 files changed, 14 insertions(+), 12 deletions(-)
hooks/post-receive
--
CMake
More information about the Cmake-commits
mailing list