summaryrefslogtreecommitdiffstats
path: root/Source/cmSetPropertyCommand.cxx
diff options
context:
space:
mode:
authorBen Boeckel <ben.boeckel@kitware.com>2013-07-22 21:19:55 (GMT)
committerBrad King <brad.king@kitware.com>2013-07-24 14:50:15 (GMT)
commit31bd83e9fc6c88b7caccd742886b077f387081e9 (patch)
tree8f3fda676e97aec9090da5a6409c9000b2a14a83 /Source/cmSetPropertyCommand.cxx
parentcb57ce249e9bfa43ef39eac482d5edb037f3ddc8 (diff)
downloadCMake-31bd83e9fc6c88b7caccd742886b077f387081e9.zip
CMake-31bd83e9fc6c88b7caccd742886b077f387081e9.tar.gz
CMake-31bd83e9fc6c88b7caccd742886b077f387081e9.tar.bz2
set_property: Do not remove a property when APPENDing nothing
Diffstat (limited to 'Source/cmSetPropertyCommand.cxx')
-rw-r--r--Source/cmSetPropertyCommand.cxx6
1 files changed, 4 insertions, 2 deletions
diff --git a/Source/cmSetPropertyCommand.cxx b/Source/cmSetPropertyCommand.cxx
index cc10840..b5e5225 100644
--- a/Source/cmSetPropertyCommand.cxx
+++ b/Source/cmSetPropertyCommand.cxx
@@ -84,12 +84,14 @@ bool cmSetPropertyCommand
{
doing = DoingNone;
this->AppendMode = true;
+ this->Remove = false;
this->AppendAsString = false;
}
else if(*arg == "APPEND_STRING")
{
doing = DoingNone;
this->AppendMode = true;
+ this->Remove = false;
this->AppendAsString = true;
}
else if(doing == DoingNames)
@@ -160,7 +162,7 @@ bool cmSetPropertyCommand::HandleGlobalMode()
}
if(this->AppendMode)
{
- cm->AppendProperty(name, value, this->AppendAsString);
+ cm->AppendProperty(name, value ? value : "", this->AppendAsString);
}
else
{
@@ -226,7 +228,7 @@ bool cmSetPropertyCommand::HandleDirectoryMode()
}
if(this->AppendMode)
{
- mf->AppendProperty(name, value, this->AppendAsString);
+ mf->AppendProperty(name, value ? value : "", this->AppendAsString);
}
else
{