kolan
/
CMake
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

cmake_parse_arguments: Restore ;-list argument flattening 

The re-implementation in commit v3.5.0-rc1~116^2~1 (CMakeParseArguments:
replace by native cmake_parse_arguments command, 2015-12-05) introduced
a regression when parsing the ARGN arguments with cmake_parse_arguments.
The original implementation used

    foreach(currentArg ${ARGN})

to iterate over input arguments.  This flattened ;-lists within the
arguments whether they were quoted or not.  Fix our new implementation
to preserve this behavior and add a test case to cover it.

Signed-off-by: Dimitar Yordanov <dimitar.yordanov@sap.com>
Signed-off-by: Matthias Maennich <matthias.maennich@sap.com>
This commit is contained in:
Dimitar Yordanov 2016-02-12 13:21:12 +01:00 committed by Brad King
parent a5a5a68572
commit c8c45a2c4e
2 changed files with 29 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
Source/cmParseArgumentsCommand.cxx
View File

@ -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())
{

19
Tests/RunCMake/cmake_parse_arguments/CornerCases.cmake
View File

@ -13,3 +13,22 @@ cmake_parse_arguments(MY_INSTALL "${options}" "${oneValueArgs}"
TEST(MY_INSTALL_DESTINATION UNDEFINED)
TEST(MY_INSTALL_OPTIONAL TRUE)
macro(foo)
set(_options )
set(_oneValueArgs FOO)
set(_multiValueArgs )
cmake_parse_arguments(_FOO2 "${_options}"
"${_oneValueArgs}"
"${_multiValueArgs}"
"${ARGN}")
cmake_parse_arguments(_FOO1 "${_options}"
"${_oneValueArgs}"
"${_multiValueArgs}"
${ARGN})
endmacro()
foo(FOO foo)
TEST(_FOO1_FOO foo)
TEST(_FOO2_FOO foo)