mirror/CMake
1
0
Fork 0
mirror of https://github.com/Kitware/CMake.git synced 2026-05-07 22:59:56 -05:00
Code Issues Packages Projects Releases Wiki Activity

Merge topic 'dev/property-append-with-empty-string'

Browse Source 
31bd83e set_property: Do not remove a property when APPENDing nothing
This commit is contained in:
Brad King
2013-07-24 11:02:44 -04:00
committed by CMake Topic Stage
parent fdbf952684 31bd83e9fc
commit e31c4bd9a6
4 changed files with 15 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Source/cmSetPropertyCommand.cxx
+4 -2
View File
@@ -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
{