diff options
| author | Brad King <brad.king@kitware.com> | 2013-07-24 15:02:44 (GMT) |
|---|---|---|
| committer | CMake Topic Stage <kwrobot@kitware.com> | 2013-07-24 15:02:44 (GMT) |
| commit | e31c4bd9a6dbb00e5b1b4dbc651ad56cbb0526ef (patch) | |
| tree | e623e36ac7c000d109d9e8b742d52a94b0e7a772 /Source | |
| parent | fdbf952684ee6c4bbfa1e44f97965591e5658c6d (diff) | |
| parent | 31bd83e9fc6c88b7caccd742886b077f387081e9 (diff) | |
| download | CMake-e31c4bd9a6dbb00e5b1b4dbc651ad56cbb0526ef.zip CMake-e31c4bd9a6dbb00e5b1b4dbc651ad56cbb0526ef.tar.gz CMake-e31c4bd9a6dbb00e5b1b4dbc651ad56cbb0526ef.tar.bz2 | |
Merge topic 'dev/property-append-with-empty-string'
31bd83e set_property: Do not remove a property when APPENDing nothing
Diffstat (limited to 'Source')
| -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 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 { |