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

cmake_parse_arguments: Fix PARSE_ARGV multi-value argument handling 

The `PARSE_ARGV` mode was recently added to help functions properly
parse their arguments even when those arguments may be quoted and
contain literal `;` in their values.  Fix the implementation to encode
`;`s in reported multi-value arguments and in `UNPARSED_ARGUMENTS` so
that `;`s in the individual values are preserved in the lists.  This
allows clients to access all their argument values correctly.
This commit is contained in:
Matthew Woehlke 2016-09-28 12:07:39 -04:00 committed by Brad King
parent 8f25f37676
commit 41291b20f3
2 changed files with 43 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
Source/cmParseArgumentsCommand.cxx
View File

@ -4,6 +4,19 @@
#include "cmAlgorithms.h" #include "cmAlgorithms.h"
static std::string escape_arg(const std::string& arg)
{
// replace ";" with "\;" so output argument lists will split correctly
std::string escapedArg;
for (size_t i = 0; i < arg.size(); ++i) {
if (arg[i] == ';') {
escapedArg += '\\';
}
escapedArg += arg[i];
}
return escapedArg;
}
bool cmParseArgumentsCommand::InitialPass(std::vector<std::string> const& args, bool cmParseArgumentsCommand::InitialPass(std::vector<std::string> const& args,
cmExecutionStatus&) cmExecutionStatus&)
{ {
@ -165,10 +178,18 @@ bool cmParseArgumentsCommand::InitialPass(std::vector<std::string> const& args,
insideValues = NONE; insideValues = NONE;
break; break;
case MULTI: case MULTI:
multi[currentArgName].push_back(*argIter); if (parseFromArgV) {
multi[currentArgName].push_back(escape_arg(*argIter));
} else {
multi[currentArgName].push_back(*argIter);
}
break; break;
default: default:
unparsed.push_back(*argIter); if (parseFromArgV) {
unparsed.push_back(escape_arg(*argIter));
} else {
unparsed.push_back(*argIter);
}
break; break;
} }
} }

22
Tests/RunCMake/cmake_parse_arguments/ArgvN.cmake
View File

@ -1,5 +1,15 @@
include(${CMAKE_CURRENT_LIST_DIR}/test_utils.cmake) include(${CMAKE_CURRENT_LIST_DIR}/test_utils.cmake)
function(test_multi list)
set(i 0)
foreach(value IN LISTS ${list})
math(EXPR j "${i} + 1")
set(${list}[${i}] "${value}")
TEST(${list}[${i}] "${ARGV${j}}")
set(i ${j})
endforeach()
endfunction()
function(test1) function(test1)
cmake_parse_arguments(PARSE_ARGV 0 cmake_parse_arguments(PARSE_ARGV 0
pref "OPT1;OPT2" "SINGLE1;SINGLE2" "MULTI1;MULTI2") pref "OPT1;OPT2" "SINGLE1;SINGLE2" "MULTI1;MULTI2")
@ -23,8 +33,16 @@ function(test2 arg1)
TEST(pref_OPT2 FALSE) TEST(pref_OPT2 FALSE)
TEST(pref_SINGLE1 "foo;bar") TEST(pref_SINGLE1 "foo;bar")
TEST(pref_SINGLE2 UNDEFINED) TEST(pref_SINGLE2 UNDEFINED)
TEST(pref_MULTI1 bar foo bar) test_multi(pref_MULTI1 bar "foo;bar")
TEST(pref_MULTI2 UNDEFINED) TEST(pref_MULTI2 UNDEFINED)
TEST(pref_UNPARSED_ARGUMENTS UNDEFINED) TEST(pref_UNPARSED_ARGUMENTS UNDEFINED)
endfunction() endfunction()
test2("first named" OPT1 SINGLE1 "foo;bar" MULTI1 bar foo bar) test2("first named" OPT1 SINGLE1 "foo;bar" MULTI1 bar "foo;bar")
function(test3 arg1)
cmake_parse_arguments(PARSE_ARGV 0
pref "" "" "")
test_multi(pref_UNPARSED_ARGUMENTS "foo;bar" dog cat)
endfunction()
test3("foo;bar" dog cat)