diff options
author | Brad King <brad.king@kitware.com> | 2009-02-02 18:27:30 (GMT) |
---|---|---|
committer | Brad King <brad.king@kitware.com> | 2009-02-02 18:27:30 (GMT) |
commit | 7d6a5e097f17720ed21fe5faac1759bf387c7880 (patch) | |
tree | 75128c86941506cf87608940d62e5de9e43423a2 /Source | |
parent | cc2092d5bb282dd4010b11a289638a243f7961e2 (diff) | |
download | CMake-7d6a5e097f17720ed21fe5faac1759bf387c7880.zip CMake-7d6a5e097f17720ed21fe5faac1759bf387c7880.tar.gz CMake-7d6a5e097f17720ed21fe5faac1759bf387c7880.tar.bz2 |
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.
Diffstat (limited to 'Source')
-rw-r--r-- | Source/cmMakefile.cxx | 4 | ||||
-rw-r--r-- | Source/cmake.cxx | 4 |
2 files changed, 8 insertions, 0 deletions
diff --git a/Source/cmMakefile.cxx b/Source/cmMakefile.cxx index fabfd35..870fd6f 100644 --- a/Source/cmMakefile.cxx +++ b/Source/cmMakefile.cxx @@ -3162,6 +3162,10 @@ const char *cmMakefile::GetProperty(const char* prop) const char *cmMakefile::GetProperty(const char* prop, cmProperty::ScopeType scope) { + if(!prop) + { + return 0; + } // watch for specific properties static std::string output; output = ""; diff --git a/Source/cmake.cxx b/Source/cmake.cxx index 1f7a746..10db0ad 100644 --- a/Source/cmake.cxx +++ b/Source/cmake.cxx @@ -3606,6 +3606,10 @@ const char *cmake::GetProperty(const char* prop) const char *cmake::GetProperty(const char* prop, cmProperty::ScopeType scope) { + if(!prop) + { + return 0; + } bool chain = false; // watch for special properties |