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

COMP: fix for when STRICT is defined, and fix for props that have no docs

This commit is contained in:
Ken Martin 2007-10-23 10:40:49 -04:00
parent 712758dfc3
commit 923b51ece0
2 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Source/cmMakefile.cxx
View File

@ -1217,7 +1217,8 @@ void cmMakefile::AddDefinition(const char* name, const char* value)
} }
#ifdef CMAKE_STRICT #ifdef CMAKE_STRICT
if (!this->CMakeInstance->IsPropertyDefined(name,cmProperty::VARIABLE)) if (this->GetCMakeInstance() &&
!this->GetCMakeInstance()->IsPropertyDefined(name,cmProperty::VARIABLE))
{ {
std::string msg = "Variable "; std::string msg = "Variable ";
msg += name; msg += name;
@ -1681,7 +1682,8 @@ bool cmMakefile::IsDefinitionSet(const char* name) const
const char* cmMakefile::GetDefinition(const char* name) const const char* cmMakefile::GetDefinition(const char* name) const
{ {
#ifdef CMAKE_STRICT #ifdef CMAKE_STRICT
if (!this->CMakeInstance->IsPropertyDefined(name,cmProperty::VARIABLE)) if (this->GetCMakeInstance() &&
!this->GetCMakeInstance()->IsPropertyDefined(name,cmProperty::VARIABLE))
{ {
std::string msg = "Variable "; std::string msg = "Variable ";
msg += name; msg += name;

5
Source/cmPropertyDefinitionMap.cxx
View File

@ -87,7 +87,10 @@ void cmPropertyDefinitionMap
cmSystemTools::UpperCase(secName).c_str()); cmSystemTools::UpperCase(secName).c_str());
} }
cmDocumentationEntry e = j->second.GetDocumentation(); cmDocumentationEntry e = j->second.GetDocumentation();
v[secName]->Append(e); if (e.Brief.size() || e.Full.size())
{
v[secName]->Append(e);
}
} }
} }