[Cmake-commits] [cmake-commits] king committed cmMakefile.cxx 1.502 1.503 cmake.cxx 1.402 1.403

cmake-commits at cmake.org cmake-commits at cmake.org
Mon Feb 2 13:27:32 EST 2009


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

Modified Files:
	cmMakefile.cxx cmake.cxx 
Log Message:
ENH: More robust property lookup

This teaches cmMakefile::GetProperty and cmake::GetProperty methods to
return NULL when the property name is NULL, making them more robust and
consistent with the behavior of cmTarget::GetProperty.


Index: cmake.cxx
===================================================================
RCS file: /cvsroot/CMake/CMake/Source/cmake.cxx,v
retrieving revision 1.402
retrieving revision 1.403
diff -C 2 -d -r1.402 -r1.403
*** cmake.cxx	29 Jan 2009 19:31:45 -0000	1.402
--- cmake.cxx	2 Feb 2009 18:27:30 -0000	1.403
***************
*** 3607,3610 ****
--- 3607,3614 ----
  const char *cmake::GetProperty(const char* prop, cmProperty::ScopeType scope)
  {
+   if(!prop)
+     {
+     return 0;
+     }
    bool chain = false;
  

Index: cmMakefile.cxx
===================================================================
RCS file: /cvsroot/CMake/CMake/Source/cmMakefile.cxx,v
retrieving revision 1.502
retrieving revision 1.503
diff -C 2 -d -r1.502 -r1.503
*** cmMakefile.cxx	22 Jan 2009 18:18:39 -0000	1.502
--- cmMakefile.cxx	2 Feb 2009 18:27:30 -0000	1.503
***************
*** 3163,3166 ****
--- 3163,3170 ----
                                      cmProperty::ScopeType scope)
  {
+   if(!prop)
+     {
+     return 0;
+     }
    // watch for specific properties
    static std::string output;



More information about the Cmake-commits mailing list