[cmake-commits] martink committed cmMakefile.cxx 1.415 1.416 cmPropertyDefinitionMap.cxx 1.4 1.5

[cmake-commits at cmake.org]

Update of /cvsroot/CMake/CMake/Source
In directory public:/mounts/ram/cvs-serv28774/Source

Modified Files:
	cmMakefile.cxx cmPropertyDefinitionMap.cxx 
Log Message:
COMP: fix for when STRICT is defined, and fix for props that have no docs


Index: cmPropertyDefinitionMap.cxx
===================================================================
RCS file: /cvsroot/CMake/CMake/Source/cmPropertyDefinitionMap.cxx,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- cmPropertyDefinitionMap.cxx	22 Oct 2007 16:48:39 -0000	1.4
+++ cmPropertyDefinitionMap.cxx	23 Oct 2007 14:40:49 -0000	1.5
@@ -87,7 +87,10 @@
                                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);
+      }
     }
 }
 

Index: cmMakefile.cxx
===================================================================
RCS file: /cvsroot/CMake/CMake/Source/cmMakefile.cxx,v
retrieving revision 1.415
retrieving revision 1.416
diff -u -d -r1.415 -r1.416
--- cmMakefile.cxx	22 Oct 2007 16:48:39 -0000	1.415
+++ cmMakefile.cxx	23 Oct 2007 14:40:49 -0000	1.416
@@ -1217,7 +1217,8 @@
     }
 
 #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 @@
 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;