diff options
| -rw-r--r-- | Source/cmSystemTools.cxx | 9 | ||||
| -rw-r--r-- | Source/cmSystemTools.h | 3 |
2 files changed, 7 insertions, 5 deletions
diff --git a/Source/cmSystemTools.cxx b/Source/cmSystemTools.cxx index 52032f0..1bee080 100644 --- a/Source/cmSystemTools.cxx +++ b/Source/cmSystemTools.cxx @@ -973,10 +973,11 @@ void cmSystemTools::ExpandList(std::vector<std::string> const& arguments, } void cmSystemTools::ExpandListArgument(const std::string& arg, - std::vector<std::string>& newargs) + std::vector<std::string>& newargs, + bool emptyArgs) { // If argument is empty, it is an empty list. - if(arg.length() == 0) + if(arg.length() == 0 && !emptyArgs) { return; } @@ -1027,7 +1028,7 @@ void cmSystemTools::ExpandListArgument(const std::string& arg, // brackets. if(squareNesting == 0) { - if ( newArgVec.size() ) + if ( newArgVec.size() || emptyArgs ) { // Add the last argument if the string is not empty. newArgVec.push_back(0); @@ -1047,7 +1048,7 @@ void cmSystemTools::ExpandListArgument(const std::string& arg, } break; } } - if ( newArgVec.size() ) + if ( newArgVec.size() || emptyArgs ) { // Add the last argument if the string is not empty. newArgVec.push_back(0); diff --git a/Source/cmSystemTools.h b/Source/cmSystemTools.h index 6c5be99..a07a7b8 100644 --- a/Source/cmSystemTools.h +++ b/Source/cmSystemTools.h @@ -39,7 +39,8 @@ public: static void ExpandList(std::vector<std::string> const& argsIn, std::vector<std::string>& argsOut); static void ExpandListArgument(const std::string& arg, - std::vector<std::string>& argsOut); + std::vector<std::string>& argsOut, + bool emptyArgs=false); /** * Look for and replace registry values in a string |