summaryrefslogtreecommitdiffstats
path: root/Source/cmGlobalXCodeGenerator.cxx
diff options
context:
space:
mode:
authorVitaly Stakhovsky <vvs31415@gitlab.org>2020-03-08 21:00:00 (GMT)
committerVitaly Stakhovsky <vvs31415@gitlab.org>2020-03-08 21:22:43 (GMT)
commitb0dc52704b5c4627c9ac11f1c63236367d7e3d3c (patch)
tree30c678d7762c831c13ca34b5078626cc9255eda4 /Source/cmGlobalXCodeGenerator.cxx
parent1bb7474abac4eb3aa7dd1b52d9d09d2205e104f3 (diff)
downloadCMake-b0dc52704b5c4627c9ac11f1c63236367d7e3d3c.zip
CMake-b0dc52704b5c4627c9ac11f1c63236367d7e3d3c.tar.gz
CMake-b0dc52704b5c4627c9ac11f1c63236367d7e3d3c.tar.bz2
cmGeneratorExpression: remove const char* overloads
Diffstat (limited to 'Source/cmGlobalXCodeGenerator.cxx')
-rw-r--r--Source/cmGlobalXCodeGenerator.cxx5
1 files changed, 3 insertions, 2 deletions
diff --git a/Source/cmGlobalXCodeGenerator.cxx b/Source/cmGlobalXCodeGenerator.cxx
index 9437e95..ac7d204 100644
--- a/Source/cmGlobalXCodeGenerator.cxx
+++ b/Source/cmGlobalXCodeGenerator.cxx
@@ -2411,8 +2411,9 @@ void cmGlobalXCodeGenerator::CreateBuildSettings(cmGeneratorTarget* gtgt,
std::string attribute = prop.substr(16);
this->FilterConfigurationAttribute(configName, attribute);
if (!attribute.empty()) {
+ const char* pr = gtgt->GetProperty(prop);
std::string processed = cmGeneratorExpression::Evaluate(
- gtgt->GetProperty(prop), this->CurrentLocalGenerator, configName);
+ pr ? pr : "", this->CurrentLocalGenerator, configName);
buildSettings->AddAttribute(attribute,
this->CreateString(processed));
}
@@ -3147,7 +3148,7 @@ bool cmGlobalXCodeGenerator::CreateXCodeObjects(
this->FilterConfigurationAttribute(config.first, attribute);
if (!attribute.empty()) {
std::string processed = cmGeneratorExpression::Evaluate(
- this->CurrentMakefile->GetDefinition(var),
+ this->CurrentMakefile->GetSafeDefinition(var),
this->CurrentLocalGenerator, config.first);
buildSettingsForCfg->AddAttribute(attribute,
this->CreateString(processed));