kolan/CMake
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

ENH: fix module documenation to handle bad docs and fix qt3 docs

Browse Source
This commit is contained in:
Bill Hoffman 2005-12-15 09:19:23 -05:00
parent eef9390dc6
commit 4b0fd57bef
2 changed files with 18 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
Modules/FindQt3.cmake
View File

@ -1,18 +1,19 @@
# - Locate Qt include paths and libraries # - Locate Qt include paths and libraries
# This module defines:
# This module defines # QT_INCLUDE_DIR - where to find qt.h, etc.
# QT_INCLUDE_DIR, where to find qt.h, etc. # QT_LIBRARIES - the libraries to link against to use Qt.
# QT_LIBRARIES, the libraries to link against to use Qt. # QT_DEFINITIONS - definitions to use when
# QT_DEFINITIONS, definitions to use when compiling code that uses Qt. # compiling code that uses Qt.
# QT_FOUND, If false, don't try to use Qt. # QT_FOUND - If false, don't try to use Qt.
#
# if you need the multithreaded version of Qt, set QT_MT_REQUIRED to TRUE # If you need the multithreaded version of Qt, set QT_MT_REQUIRED to TRUE
#
# also defined, but not for general use are # Also defined, but not for general use are:
# QT_MOC_EXECUTABLE, where to find the moc tool. # QT_MOC_EXECUTABLE, where to find the moc tool.
# QT_UIC_EXECUTABLE, where to find the uic tool. # QT_UIC_EXECUTABLE, where to find the uic tool.
# QT_QT_LIBRARY, where to find the Qt library. # QT_QT_LIBRARY, where to find the Qt library.
# QT_QTMAIN_LIBRARY, where to find the qtmain library. This is only required by Qt3 on Windows. # QT_QTMAIN_LIBRARY, where to find the qtmain
# library. This is only required by Qt3 on Windows.
# These are around for backwards compatibility # These are around for backwards compatibility
# they will be set # they will be set

10
Source/cmDocumentation.cxx
View File

@ -309,8 +309,9 @@ bool cmDocumentation::CreateSingleModule(const char* fname, const char* moduleNa
} }
else else
{ {
if(text.length() < 2) if(text.length() < 2 && brief.length() == 0)
{ {
std::cerr << text << " " << brief << "\n";
return false; return false;
} }
char* pname = strcpy(new char[strlen(moduleName)+1], moduleName); char* pname = strcpy(new char[strlen(moduleName)+1], moduleName);
@ -321,7 +322,7 @@ bool cmDocumentation::CreateSingleModule(const char* fname, const char* moduleNa
this->ModuleStrings.push_back(pbrief); this->ModuleStrings.push_back(pbrief);
cmDocumentationEntry e = { pname, pbrief, ptext }; cmDocumentationEntry e = { pname, pbrief, ptext };
this->ModulesSection.push_back(e); this->ModulesSection.push_back(e);
return false; return true;
} }
} }
return true; return true;
@ -1001,9 +1002,10 @@ bool cmDocumentation::PrintDocumentationSingleModule(std::ostream& os)
cmakeModules += "/Modules/"; cmakeModules += "/Modules/";
cmakeModules += this->SingleModuleName; cmakeModules += this->SingleModuleName;
cmakeModules += ".cmake"; cmakeModules += ".cmake";
if(cmSystemTools::FileExists(cmakeModules.c_str())) if(cmSystemTools::FileExists(cmakeModules.c_str())
&& this->CreateSingleModule(cmakeModules.c_str(),
this->SingleModuleName.c_str()))
{ {
this->CreateSingleModule(cmakeModules.c_str(), this->SingleModuleName.c_str());
this->PrintDocumentationCommand(os, &this->ModulesSection[0]); this->PrintDocumentationCommand(os, &this->ModulesSection[0]);
return true; return true;
} }