Fix #12342: Add APPEND_STRING option to set_property()

set_property() has APPEND, which creates a list. E.g. when
appending to COMPILE_FLAGS a string is needed, not a list.
With the APPEND_STRING option the value is append as string,
not as list.

Alex

1 files changed, 7 insertions, 5 deletions

diff --git a/Source/cmCacheManager.cxx b/Source/cmCacheManager.cxx
index c8374db3f6..ab0bb79b55 100644
--- a/Source/cmCacheManager.cxx
+++ b/Source/cmCacheManager.cxx
@@ -849,7 +849,8 @@ void cmCacheManager::CacheEntry::SetProperty(const char* prop,
 
 //----------------------------------------------------------------------------
 void cmCacheManager::CacheEntry::AppendProperty(const char* prop,
-                                                const char* value)
+                                                const char* value,
+                                                bool asString)
 {
   if(strcmp(prop, "TYPE") == 0)
     {
@@ -859,7 +860,7 @@ void cmCacheManager::CacheEntry::AppendProperty(const char* prop,
     {
     if(value)
       {
-      if(!this->Value.empty() && *value)
+      if(!this->Value.empty() && *value && !asString)
         {
         this->Value += ";";
         }
@@ -868,7 +869,7 @@ void cmCacheManager::CacheEntry::AppendProperty(const char* prop,
     }
   else
     {
-    this->Properties.AppendProperty(prop, value, cmProperty::CACHE);
+    this->Properties.AppendProperty(prop, value, cmProperty::CACHE, asString);
     }
 }
 
@@ -893,11 +894,12 @@ void cmCacheManager::CacheIterator::SetProperty(const char* p, const char* v)
 
 //----------------------------------------------------------------------------
 void cmCacheManager::CacheIterator::AppendProperty(const char* p,
-                                                   const char* v)
+                                                   const char* v,
+                                                   bool asString)
 {
   if(!this->IsAtEnd())
     {
-    this->GetEntry().AppendProperty(p, v);
+    this->GetEntry().AppendProperty(p, v, asString);
     }
 }