diff options
| author | Ben Boeckel <ben.boeckel@kitware.com> | 2013-07-22 17:19:55 -0400 |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2013-07-24 10:50:15 -0400 |
| commit | 31bd83e9fc6c88b7caccd742886b077f387081e9 (patch) | |
| tree | 8f3fda676e97aec9090da5a6409c9000b2a14a83 /Source/cmSetPropertyCommand.cxx | |
| parent | cb57ce249e9bfa43ef39eac482d5edb037f3ddc8 (diff) | |
| download | cmake-31bd83e9fc6c88b7caccd742886b077f387081e9.tar.gz | |
set_property: Do not remove a property when APPENDing nothing
Diffstat (limited to 'Source/cmSetPropertyCommand.cxx')
| -rw-r--r-- | Source/cmSetPropertyCommand.cxx | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/Source/cmSetPropertyCommand.cxx b/Source/cmSetPropertyCommand.cxx index cc10840fd6..b5e5225156 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 { |