Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
Brad King
CMake
Commits
ec2c67bc
Commit
ec2c67bc
authored
Feb 18, 2013
by
Stephen Kelly
Browse files
Strip stray semicolons when evaluating generator expressions.
parent
a0ac2c59
Changes
3
Hide whitespace changes
Inline
Side-by-side
Source/cmGeneratorExpression.cxx
View file @
ec2c67bc
...
...
@@ -153,7 +153,8 @@ cmCompiledGeneratorExpression::~cmCompiledGeneratorExpression()
}
//----------------------------------------------------------------------------
static
std
::
string
stripEmptyListElements
(
const
std
::
string
&
input
)
std
::
string
cmGeneratorExpression
::
StripEmptyListElements
(
const
std
::
string
&
input
)
{
std
::
string
result
;
...
...
@@ -223,7 +224,7 @@ static std::string stripAllGeneratorExpressions(const std::string &input)
lastPos
=
pos
;
}
result
+=
input
.
substr
(
lastPos
);
return
s
tripEmptyListElements
(
result
);
return
cmGeneratorExpression
::
S
tripEmptyListElements
(
result
);
}
//----------------------------------------------------------------------------
...
...
@@ -284,7 +285,7 @@ static std::string stripExportInterface(const std::string &input,
}
result
+=
input
.
substr
(
lastPos
);
return
s
tripEmptyListElements
(
result
);
return
cmGeneratorExpression
::
S
tripEmptyListElements
(
result
);
}
//----------------------------------------------------------------------------
...
...
Source/cmGeneratorExpression.h
View file @
ec2c67bc
...
...
@@ -66,6 +66,7 @@ public:
static
bool
IsValidTargetName
(
const
std
::
string
&
input
);
static
std
::
string
StripEmptyListElements
(
const
std
::
string
&
input
);
private:
cmGeneratorExpression
(
const
cmGeneratorExpression
&
);
void
operator
=
(
const
cmGeneratorExpression
&
);
...
...
Source/cmGeneratorExpressionEvaluator.cxx
View file @
ec2c67bc
...
...
@@ -508,6 +508,9 @@ static const struct TargetPropertyNode : public cmGeneratorExpressionNode
}
}
linkedTargetsContent
=
cmGeneratorExpression
::
StripEmptyListElements
(
linkedTargetsContent
);
if
(
!
prop
)
{
if
(
target
->
IsImported
())
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment