summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBill Hoffman <bill.hoffman@kitware.com>2009-01-18 17:05:45 (GMT)
committerBill Hoffman <bill.hoffman@kitware.com>2009-01-18 17:05:45 (GMT)
commite4048118dea476a018d1944771e0c95b8805ec21 (patch)
tree9698767aa360b77a48a2a7cfd845ebf242388836
parent97b2bc3d6b5ac785a0e53e7fa38239e39836f2d4 (diff)
downloadCMake-e4048118dea476a018d1944771e0c95b8805ec21.zip
CMake-e4048118dea476a018d1944771e0c95b8805ec21.tar.gz
CMake-e4048118dea476a018d1944771e0c95b8805ec21.tar.bz2
BUG: fix crash with empty properties
-rw-r--r--Source/cmMakefile.cxx10
1 files changed, 8 insertions, 2 deletions
diff --git a/Source/cmMakefile.cxx b/Source/cmMakefile.cxx
index c9a9238..92d5938 100644
--- a/Source/cmMakefile.cxx
+++ b/Source/cmMakefile.cxx
@@ -2915,7 +2915,10 @@ void cmMakefile::SetProperty(const char* prop, const char* value)
if ( propname == "INCLUDE_DIRECTORIES" )
{
std::vector<std::string> varArgsExpanded;
- cmSystemTools::ExpandListArgument(value, varArgsExpanded);
+ if(value)
+ {
+ cmSystemTools::ExpandListArgument(value, varArgsExpanded);
+ }
this->SetIncludeDirectories(varArgsExpanded);
return;
}
@@ -2923,7 +2926,10 @@ void cmMakefile::SetProperty(const char* prop, const char* value)
if ( propname == "LINK_DIRECTORIES" )
{
std::vector<std::string> varArgsExpanded;
- cmSystemTools::ExpandListArgument(value, varArgsExpanded);
+ if(value)
+ {
+ cmSystemTools::ExpandListArgument(value, varArgsExpanded);
+ }
this->SetLinkDirectories(varArgsExpanded);
return;
}