summaryrefslogtreecommitdiffstats
path: root/Source/cmMakefile.cxx
diff options
context:
space:
mode:
authorBrad King <brad.king@kitware.com>2011-07-26 18:57:32 (GMT)
committerCMake Topic Stage <kwrobot@kitware.com>2011-07-26 18:57:32 (GMT)
commit119dce33d3b51e01507e917ca53f1dd08a7a4c23 (patch)
tree33c28994743cc860389aecf21ed9f36f7aa9f3f9 /Source/cmMakefile.cxx
parentdc96b975c52f79ba332b15bc33048ae01108e0ab (diff)
parent9dbba1b46421d4c45f7090f4573df6e73afccf69 (diff)
downloadCMake-119dce33d3b51e01507e917ca53f1dd08a7a4c23.zip
CMake-119dce33d3b51e01507e917ca53f1dd08a7a4c23.tar.gz
CMake-119dce33d3b51e01507e917ca53f1dd08a7a4c23.tar.bz2
Merge topic 'SetPropertyAppendString'
9dbba1b Fix #12342: Add APPEND_STRING option to set_property()
Diffstat (limited to 'Source/cmMakefile.cxx')
-rw-r--r--Source/cmMakefile.cxx5
1 files changed, 3 insertions, 2 deletions
diff --git a/Source/cmMakefile.cxx b/Source/cmMakefile.cxx
index 014ef67..a5cdee4 100644
--- a/Source/cmMakefile.cxx
+++ b/Source/cmMakefile.cxx
@@ -3336,7 +3336,8 @@ void cmMakefile::SetProperty(const char* prop, const char* value)
this->Properties.SetProperty(prop,value,cmProperty::DIRECTORY);
}
-void cmMakefile::AppendProperty(const char* prop, const char* value)
+void cmMakefile::AppendProperty(const char* prop, const char* value,
+ bool asString)
{
if (!prop)
{
@@ -3369,7 +3370,7 @@ void cmMakefile::AppendProperty(const char* prop, const char* value)
return;
}
- this->Properties.AppendProperty(prop,value,cmProperty::DIRECTORY);
+ this->Properties.AppendProperty(prop,value,cmProperty::DIRECTORY,asString);
}
const char *cmMakefile::GetPropertyOrDefinition(const char* prop)