summaryrefslogtreecommitdiffstats
path: root/Source/cmGeneratorExpressionNode.cxx
diff options
context:
space:
mode:
authorBrad King <brad.king@kitware.com>2019-08-22 14:23:24 (GMT)
committerKitware Robot <kwrobot@kitware.com>2019-08-22 14:23:34 (GMT)
commit337be1507d0850c1d83de0f9ad87a780c9cb61af (patch)
tree8f6e685341766cc429b5120a1a120bbfaf9bbaea /Source/cmGeneratorExpressionNode.cxx
parent6e1ff50efbc49628e7f9575b57128c0829bf607c (diff)
parentd331021255ba9092fa34e8e479d724b1092c704d (diff)
downloadCMake-337be1507d0850c1d83de0f9ad87a780c9cb61af.zip
CMake-337be1507d0850c1d83de0f9ad87a780c9cb61af.tar.gz
CMake-337be1507d0850c1d83de0f9ad87a780c9cb61af.tar.bz2
Merge topic 'isolate-declarations'
d331021255 clang-tidy: isolate declarations for readability Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !3704
Diffstat (limited to 'Source/cmGeneratorExpressionNode.cxx')
-rw-r--r--Source/cmGeneratorExpressionNode.cxx9
1 files changed, 6 insertions, 3 deletions
diff --git a/Source/cmGeneratorExpressionNode.cxx b/Source/cmGeneratorExpressionNode.cxx
index 8cd8858..f181132 100644
--- a/Source/cmGeneratorExpressionNode.cxx
+++ b/Source/cmGeneratorExpressionNode.cxx
@@ -275,7 +275,8 @@ static const struct InListNode : public cmGeneratorExpressionNode
const GeneratorExpressionContent* /*content*/,
cmGeneratorExpressionDAGChecker* /*dagChecker*/) const override
{
- std::vector<std::string> values, checkValues;
+ std::vector<std::string> values;
+ std::vector<std::string> checkValues;
bool check = false;
switch (context->LG->GetPolicyStatus(cmPolicies::CMP0085)) {
case cmPolicies::WARN:
@@ -344,7 +345,8 @@ static const struct FilterNode : public cmGeneratorExpressionNode
return {};
}
- std::vector<std::string> values, result;
+ std::vector<std::string> values;
+ std::vector<std::string> result;
cmExpandList(parameters.front(), values, true);
std::copy_if(values.cbegin(), values.cend(), std::back_inserter(result),
@@ -1105,7 +1107,8 @@ static const struct TargetPropertyNode : public cmGeneratorExpressionNode
static cmsys::RegularExpression propertyNameValidator("^[A-Za-z0-9_]+$");
cmGeneratorTarget const* target = nullptr;
- std::string targetName, propertyName;
+ std::string targetName;
+ std::string propertyName;
if (parameters.size() == 2) {
targetName = parameters[0];