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

ENH: ExpandListArguments(): empty elements in semi-colon-separated string-list can now be ignored.

This commit is contained in:
Sebastien Barre 2002-03-26 16:44:49 -05:00
parent a5b833119d
commit ccbdc30a8c
2 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
Source/cmSystemTools.cxx
View File

@ -1609,7 +1609,8 @@ void cmSystemTools::GlobDirs(const char *fullPath,
void cmSystemTools::ExpandListArguments(std::vector<std::string> const& arguments, void cmSystemTools::ExpandListArguments(std::vector<std::string> const& arguments,
std::vector<std::string>& newargs) std::vector<std::string>& newargs,
bool ignore_empty)
{ {
std::vector<std::string>::const_iterator i; std::vector<std::string>::const_iterator i;
for(i = arguments.begin();i != arguments.end(); ++i) for(i = arguments.begin();i != arguments.end(); ++i)
@ -1630,7 +1631,10 @@ void cmSystemTools::ExpandListArguments(std::vector<std::string> const& argument
{ {
len = i->size()-start; len = i->size()-start;
} }
newargs.push_back(i->substr(start, len)); if (ignore_empty == false || len > 0)
{
newargs.push_back(i->substr(start, len));
}
start = endpos+1; start = endpos+1;
} }
} }

3
Source/cmSystemTools.h
View File

@ -48,7 +48,8 @@ public:
* containing the expanded versions of all arguments in argsIn. * containing the expanded versions of all arguments in argsIn.
*/ */
static void ExpandListArguments(std::vector<std::string> const& argsIn, static void ExpandListArguments(std::vector<std::string> const& argsIn,
std::vector<std::string>& argsOut); std::vector<std::string>& argsOut,
bool ignore_empty = false);
/** /**
* Look for and replace registry values in a string * Look for and replace registry values in a string