diff options
| author | Stephen Kelly <steveire@gmail.com> | 2013-05-02 09:02:01 +0200 |
|---|---|---|
| committer | Stephen Kelly <steveire@gmail.com> | 2013-05-16 19:25:06 +0200 |
| commit | 05bf9721e48f8fbf3b3b5338ec779ee5e344a6d0 (patch) | |
| tree | 771762e9c751ac334c293edd9107b860b2d23c9f /Source | |
| parent | 272431a84ff13eb17cf04389428f57c7fe13e3a2 (diff) | |
| download | cmake-05bf9721e48f8fbf3b3b5338ec779ee5e344a6d0.tar.gz | |
Fix handling of commas in arbitrary content in genexes.
As the comma is the parameter separator, it needs to be re-added
when evaluating to reconstruct arbitrary content.
Diffstat (limited to 'Source')
| -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 6618e83e28..5d0619936e 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()) { |