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

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;

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);
+      }
     }
 }