diff options
| author | Brad King <brad.king@kitware.com> | 2016-02-12 16:25:36 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2016-02-12 16:25:36 (GMT) |
| commit | 229a5bc9034549c8d9693878b1031b5f886eb1b7 (patch) | |
| tree | 6d41b86712bcc8d52f144cb98aac96c3c798155a /Source | |
| parent | 2410a20ebb01e6ff88f7bbd43e1d65fcd9385d09 (diff) | |
| parent | c8c45a2c4e10715e5cf05acaa0ac2c80f28b9a6a (diff) | |
| download | CMake-229a5bc9034549c8d9693878b1031b5f886eb1b7.zip CMake-229a5bc9034549c8d9693878b1031b5f886eb1b7.tar.gz CMake-229a5bc9034549c8d9693878b1031b5f886eb1b7.tar.bz2 | |
Merge branch 'fix-cmake_parse_arguments-expansion' into release
Diffstat (limited to 'Source')
| -rw-r--r-- | Source/cmParseArgumentsCommand.cxx | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/Source/cmParseArgumentsCommand.cxx b/Source/cmParseArgumentsCommand.cxx index a861965..ca76c88 100644 --- a/Source/cmParseArgumentsCommand.cxx +++ b/Source/cmParseArgumentsCommand.cxx @@ -97,10 +97,18 @@ bool cmParseArgumentsCommand } insideValues = NONE; std::string currentArgName; - // now iterate over the remaining arguments - // and fill in the values where applicable + // Flatten ;-lists in the arguments into a single list as was done + // by the original function(CMAKE_PARSE_ARGUMENTS). + list.clear(); for(; argIter != argEnd; ++argIter) { + cmSystemTools::ExpandListArgument(*argIter, list); + } + + // iterate over the arguments list and fill in the values where applicable + for (argIter = list.begin(), argEnd = list.end(); + argIter != argEnd; ++argIter) + { const options_map::iterator optIter = options.find(*argIter); if (optIter != options.end()) { |