diff options
| author | Brad King <brad.king@kitware.com> | 2013-05-21 19:19:26 (GMT) |
|---|---|---|
| committer | CMake Topic Stage <kwrobot@kitware.com> | 2013-05-21 19:19:26 (GMT) |
| commit | d2cd362c31aafb157970c04bf507bafcf475f89a (patch) | |
| tree | 71dfcfda035da5945a68ece548569bb1e9c5d260 /Source/cmGeneratorExpressionEvaluator.cxx | |
| parent | e41ef3d3394b942408b5e6203aca1392d7a421a0 (diff) | |
| parent | 05bf9721e48f8fbf3b3b5338ec779ee5e344a6d0 (diff) | |
| download | CMake-d2cd362c31aafb157970c04bf507bafcf475f89a.zip CMake-d2cd362c31aafb157970c04bf507bafcf475f89a.tar.gz CMake-d2cd362c31aafb157970c04bf507bafcf475f89a.tar.bz2 | |
Merge topic 'fix-genex-comma-parse'
05bf972 Fix handling of commas in arbitrary content in genexes.
Diffstat (limited to 'Source/cmGeneratorExpressionEvaluator.cxx')
| -rw-r--r-- | Source/cmGeneratorExpressionEvaluator.cxx | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/Source/cmGeneratorExpressionEvaluator.cxx b/Source/cmGeneratorExpressionEvaluator.cxx index b969ca4..58fd251 100644 --- a/Source/cmGeneratorExpressionEvaluator.cxx +++ b/Source/cmGeneratorExpressionEvaluator.cxx @@ -1051,11 +1051,6 @@ std::string GeneratorExpressionContent::Evaluate( pend = this->ParamChildren.end(); for ( ; pit != pend; ++pit) { - if (!result.empty()) - { - result += ","; - } - std::vector<cmGeneratorExpressionEvaluator*>::const_iterator it = pit->begin(); const std::vector<cmGeneratorExpressionEvaluator*>::const_iterator end @@ -1077,6 +1072,10 @@ std::string GeneratorExpressionContent::Evaluate( return std::string(); } } + if ((pit + 1) != pend) + { + result += ","; + } } if (node->RequiresLiteralInput()) { |