Merge topic 'fix-buildsystem-target-properties'

b9856862 Tests: Cover set_property for buildsystem target properties
407ff47e cmTarget: Fix memory leak when SOURCES property is cleared
cf74fc24 cmTarget: Fix buildsystem property empty value set and append operations

1 files changed, 49 insertions, 24 deletions

diff --git a/Source/cmTarget.cxx b/Source/cmTarget.cxx
index 590654d..3425f34 100644
--- a/Source/cmTarget.cxx
+++ b/Source/cmTarget.cxx
@@ -1601,33 +1601,45 @@ void cmTarget::SetProperty(const std::string& prop, const char* value)
     {
     this->Internal->IncludeDirectoriesEntries.clear();
     this->Internal->IncludeDirectoriesBacktraces.clear();
-    this->Internal->IncludeDirectoriesEntries.push_back(value);
-    cmListFileBacktrace lfbt = this->Makefile->GetBacktrace();
-    this->Internal->IncludeDirectoriesBacktraces.push_back(lfbt);
+    if (value)
+      {
+      this->Internal->IncludeDirectoriesEntries.push_back(value);
+      cmListFileBacktrace lfbt = this->Makefile->GetBacktrace();
+      this->Internal->IncludeDirectoriesBacktraces.push_back(lfbt);
+      }
     }
   else if(prop == "COMPILE_OPTIONS")
     {
     this->Internal->CompileOptionsEntries.clear();
     this->Internal->CompileOptionsBacktraces.clear();
-    this->Internal->CompileOptionsEntries.push_back(value);
-    cmListFileBacktrace lfbt = this->Makefile->GetBacktrace();
-    this->Internal->CompileOptionsBacktraces.push_back(lfbt);
+    if (value)
+      {
+      this->Internal->CompileOptionsEntries.push_back(value);
+      cmListFileBacktrace lfbt = this->Makefile->GetBacktrace();
+      this->Internal->CompileOptionsBacktraces.push_back(lfbt);
+      }
     }
   else if(prop == "COMPILE_FEATURES")
     {
     this->Internal->CompileFeaturesEntries.clear();
     this->Internal->CompileFeaturesBacktraces.clear();
-    this->Internal->CompileFeaturesEntries.push_back(value);
-    cmListFileBacktrace lfbt = this->Makefile->GetBacktrace();
-    this->Internal->CompileFeaturesBacktraces.push_back(lfbt);
+    if (value)
+      {
+      this->Internal->CompileFeaturesEntries.push_back(value);
+      cmListFileBacktrace lfbt = this->Makefile->GetBacktrace();
+      this->Internal->CompileFeaturesBacktraces.push_back(lfbt);
+      }
     }
   else if(prop == "COMPILE_DEFINITIONS")
     {
     this->Internal->CompileDefinitionsEntries.clear();
     this->Internal->CompileDefinitionsBacktraces.clear();
-    this->Internal->CompileDefinitionsEntries.push_back(value);
-    cmListFileBacktrace lfbt = this->Makefile->GetBacktrace();
-    this->Internal->CompileDefinitionsBacktraces.push_back(lfbt);
+    if (value)
+      {
+      this->Internal->CompileDefinitionsEntries.push_back(value);
+      cmListFileBacktrace lfbt = this->Makefile->GetBacktrace();
+      this->Internal->CompileDefinitionsBacktraces.push_back(lfbt);
+      }
     }
   else if(prop == "EXPORT_NAME" && this->IsImported())
     {
@@ -1659,6 +1671,7 @@ void cmTarget::SetProperty(const std::string& prop, const char* value)
     this->Internal->SourceFilesMap.clear();
     cmListFileBacktrace lfbt = this->Makefile->GetBacktrace();
     cmGeneratorExpression ge(lfbt);
+    cmDeleteAll(this->Internal->SourceEntries);
     this->Internal->SourceEntries.clear();
     cmsys::auto_ptr<cmCompiledGeneratorExpression> cge = ge.Parse(value);
     this->Internal->SourceEntries.push_back(
@@ -1693,27 +1706,39 @@ void cmTarget::AppendProperty(const std::string& prop, const char* value,
     }
   else if(prop == "INCLUDE_DIRECTORIES")
     {
-    this->Internal->IncludeDirectoriesEntries.push_back(value);
-    cmListFileBacktrace lfbt = this->Makefile->GetBacktrace();
-    this->Internal->IncludeDirectoriesBacktraces.push_back(lfbt);
+    if (value)
+      {
+      this->Internal->IncludeDirectoriesEntries.push_back(value);
+      cmListFileBacktrace lfbt = this->Makefile->GetBacktrace();
+      this->Internal->IncludeDirectoriesBacktraces.push_back(lfbt);
+      }
     }
   else if(prop == "COMPILE_OPTIONS")
     {
-    this->Internal->CompileOptionsEntries.push_back(value);
-    cmListFileBacktrace lfbt = this->Makefile->GetBacktrace();
-    this->Internal->CompileOptionsBacktraces.push_back(lfbt);
+    if (value)
+      {
+      this->Internal->CompileOptionsEntries.push_back(value);
+      cmListFileBacktrace lfbt = this->Makefile->GetBacktrace();
+      this->Internal->CompileOptionsBacktraces.push_back(lfbt);
+      }
     }
   else if(prop == "COMPILE_FEATURES")
     {
-    this->Internal->CompileFeaturesEntries.push_back(value);
-    cmListFileBacktrace lfbt = this->Makefile->GetBacktrace();
-    this->Internal->CompileFeaturesBacktraces.push_back(lfbt);
+    if (value)
+      {
+      this->Internal->CompileFeaturesEntries.push_back(value);
+      cmListFileBacktrace lfbt = this->Makefile->GetBacktrace();
+      this->Internal->CompileFeaturesBacktraces.push_back(lfbt);
+      }
     }
   else if(prop == "COMPILE_DEFINITIONS")
     {
-    this->Internal->CompileDefinitionsEntries.push_back(value);
-    cmListFileBacktrace lfbt = this->Makefile->GetBacktrace();
-    this->Internal->CompileDefinitionsBacktraces.push_back(lfbt);
+    if (value)
+      {
+      this->Internal->CompileDefinitionsEntries.push_back(value);
+      cmListFileBacktrace lfbt = this->Makefile->GetBacktrace();
+      this->Internal->CompileDefinitionsBacktraces.push_back(lfbt);
+      }
     }
   else if(prop == "EXPORT_NAME" && this->IsImported())
     {