diff options
| author | Ken Martin <ken.martin@kitware.com> | 2007-10-23 14:40:49 (GMT) |
|---|---|---|
| committer | Ken Martin <ken.martin@kitware.com> | 2007-10-23 14:40:49 (GMT) |
| commit | 923b51ece003a658b4876743c3d9b6567c43e7e3 (patch) | |
| tree | 0009d8c94dba93b63d05b3af2b4d38cbacbb111a | |
| parent | 712758dfc3a3f6f82f90d5808eec2eed433beb42 (diff) | |
| download | CMake-923b51ece003a658b4876743c3d9b6567c43e7e3.zip CMake-923b51ece003a658b4876743c3d9b6567c43e7e3.tar.gz CMake-923b51ece003a658b4876743c3d9b6567c43e7e3.tar.bz2 | |
COMP: fix for when STRICT is defined, and fix for props that have no docs
| -rw-r--r-- | Source/cmMakefile.cxx | 6 | ||||
| -rw-r--r-- | Source/cmPropertyDefinitionMap.cxx | 5 |
2 files changed, 8 insertions, 3 deletions
diff --git a/Source/cmMakefile.cxx b/Source/cmMakefile.cxx index f2cafa6..c9e0c78 100644 --- a/Source/cmMakefile.cxx +++ b/Source/cmMakefile.cxx @@ -1217,7 +1217,8 @@ void cmMakefile::AddDefinition(const char* name, const char* value) } #ifdef CMAKE_STRICT - if (!this->CMakeInstance->IsPropertyDefined(name,cmProperty::VARIABLE)) + if (this->GetCMakeInstance() && + !this->GetCMakeInstance()->IsPropertyDefined(name,cmProperty::VARIABLE)) { std::string msg = "Variable "; msg += name; @@ -1681,7 +1682,8 @@ bool cmMakefile::IsDefinitionSet(const char* name) const const char* cmMakefile::GetDefinition(const char* name) const { #ifdef CMAKE_STRICT - if (!this->CMakeInstance->IsPropertyDefined(name,cmProperty::VARIABLE)) + if (this->GetCMakeInstance() && + !this->GetCMakeInstance()->IsPropertyDefined(name,cmProperty::VARIABLE)) { std::string msg = "Variable "; msg += name; diff --git a/Source/cmPropertyDefinitionMap.cxx b/Source/cmPropertyDefinitionMap.cxx index 72488e1..b9d0cde 100644 --- a/Source/cmPropertyDefinitionMap.cxx +++ b/Source/cmPropertyDefinitionMap.cxx @@ -87,7 +87,10 @@ void cmPropertyDefinitionMap cmSystemTools::UpperCase(secName).c_str()); } cmDocumentationEntry e = j->second.GetDocumentation(); - v[secName]->Append(e); + if (e.Brief.size() || e.Full.size()) + { + v[secName]->Append(e); + } } } |