diff options
| author | Sebastien Barre <sebastien.barre@kitware.com> | 2002-03-26 21:44:49 (GMT) |
|---|---|---|
| committer | Sebastien Barre <sebastien.barre@kitware.com> | 2002-03-26 21:44:49 (GMT) |
| commit | ccbdc30a8c9c1f763efecf19a0f15f1d1b43e74f (patch) | |
| tree | f79159505a04f097ccfed117d69610ff1988db30 /Source | |
| parent | a5b833119db2f76472dda7b7dd22b07b9113453e (diff) | |
| download | CMake-ccbdc30a8c9c1f763efecf19a0f15f1d1b43e74f.zip CMake-ccbdc30a8c9c1f763efecf19a0f15f1d1b43e74f.tar.gz CMake-ccbdc30a8c9c1f763efecf19a0f15f1d1b43e74f.tar.bz2 | |
ENH: ExpandListArguments(): empty elements in semi-colon-separated string-list can now be ignored.
Diffstat (limited to 'Source')
| -rw-r--r-- | Source/cmSystemTools.cxx | 8 | ||||
| -rw-r--r-- | Source/cmSystemTools.h | 3 |
2 files changed, 8 insertions, 3 deletions
diff --git a/Source/cmSystemTools.cxx b/Source/cmSystemTools.cxx index 5102fa2..6f34c8e 100644 --- a/Source/cmSystemTools.cxx +++ b/Source/cmSystemTools.cxx @@ -1609,7 +1609,8 @@ void cmSystemTools::GlobDirs(const char *fullPath, 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; 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; } - newargs.push_back(i->substr(start, len)); + if (ignore_empty == false || len > 0) + { + newargs.push_back(i->substr(start, len)); + } start = endpos+1; } } diff --git a/Source/cmSystemTools.h b/Source/cmSystemTools.h index 9cbd62a..b9f6842 100644 --- a/Source/cmSystemTools.h +++ b/Source/cmSystemTools.h @@ -48,7 +48,8 @@ public: * containing the expanded versions of all arguments in 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 |