summaryrefslogtreecommitdiff
path: root/Source/cmGeneratorExpressionNode.cxx
diff options
context:
space:
mode:
authorVitaly Stakhovsky <vvs31415@gitlab.org>2020-03-30 13:45:00 -0400
committerVitaly Stakhovsky <vvs31415@gitlab.org>2020-03-30 15:00:14 -0400
commit3eec21a01cda630f34a4505d66bdbf6d5063ecdc (patch)
tree78481680659c0c29e7dc2cb4cac82bce280ce8a0 /Source/cmGeneratorExpressionNode.cxx
parent888b8a43d82e6f6157642c2bd84520920d8e2d11 (diff)
downloadcmake-3eec21a01cda630f34a4505d66bdbf6d5063ecdc.tar.gz
cmTarget::GetProperty: return cmProp
Diffstat (limited to 'Source/cmGeneratorExpressionNode.cxx')
-rw-r--r--Source/cmGeneratorExpressionNode.cxx10
1 files changed, 5 insertions, 5 deletions
diff --git a/Source/cmGeneratorExpressionNode.cxx b/Source/cmGeneratorExpressionNode.cxx
index c0db90fac3..dfc354d194 100644
--- a/Source/cmGeneratorExpressionNode.cxx
+++ b/Source/cmGeneratorExpressionNode.cxx
@@ -907,8 +907,8 @@ static const struct ConfigurationTestNode : public cmGeneratorExpressionNode
}
if (context->CurrentTarget && context->CurrentTarget->IsImported()) {
- const char* loc = nullptr;
- const char* imp = nullptr;
+ cmProp loc = nullptr;
+ cmProp imp = nullptr;
std::string suffix;
if (context->CurrentTarget->Target->GetMappedConfig(context->Config, loc,
imp, suffix)) {
@@ -1565,11 +1565,11 @@ static const struct TargetObjectsNode : public cmGeneratorExpressionNode
std::vector<std::string> objects;
if (gt->IsImported()) {
- const char* loc = nullptr;
- const char* imp = nullptr;
+ cmProp loc = nullptr;
+ cmProp imp = nullptr;
std::string suffix;
if (gt->Target->GetMappedConfig(context->Config, loc, imp, suffix)) {
- cmExpandList(loc, objects);
+ cmExpandList(*loc, objects);
}
context->HadContextSensitiveCondition = true;
} else {