summaryrefslogtreecommitdiffstats
path: root/Source/cmMakefile.cxx
diff options
context:
space:
mode:
authorAlex Neundorf <neundorf@kde.org>2011-07-13 21:14:41 (GMT)
committerAlex Neundorf <neundorf@kde.org>2011-07-15 18:57:33 (GMT)
commit9dbba1b46421d4c45f7090f4573df6e73afccf69 (patch)
treeb4c6a0985d675a6e1e0fd4123608e5a6a36ae235 /Source/cmMakefile.cxx
parent37340687a4d779320d7778cb62fdfd384fa32f9a (diff)
downloadCMake-9dbba1b46421d4c45f7090f4573df6e73afccf69.zip
CMake-9dbba1b46421d4c45f7090f4573df6e73afccf69.tar.gz
CMake-9dbba1b46421d4c45f7090f4573df6e73afccf69.tar.bz2
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
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 63bf03b..e215115 100644
--- a/Source/cmMakefile.cxx
+++ b/Source/cmMakefile.cxx
@@ -3332,7 +3332,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)
{
@@ -3365,7 +3366,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)