diff options
| author | Brad King <brad.king@kitware.com> | 2015-01-12 14:41:02 (GMT) |
|---|---|---|
| committer | CMake Topic Stage <kwrobot@kitware.com> | 2015-01-12 14:41:02 (GMT) |
| commit | dd6c596c12070c0fdc71cb11ac154e99111fb6e0 (patch) | |
| tree | 27fc1aa3fb5d409e619f590ede5fee3bf477f925 /Source/cmSystemTools.cxx | |
| parent | d9a6ea4599eb3b736b4e695a9ffd5d8a51eac059 (diff) | |
| parent | 55a73e6b1f70b3c8a783b130dff4c4689cea5ba2 (diff) | |
| download | CMake-dd6c596c12070c0fdc71cb11ac154e99111fb6e0.zip CMake-dd6c596c12070c0fdc71cb11ac154e99111fb6e0.tar.gz CMake-dd6c596c12070c0fdc71cb11ac154e99111fb6e0.tar.bz2 | |
Merge topic 'join-algorithm'
55a73e6b Use the cmJoin algorithm where possible.
8dc8d756 cmStandardIncludes: Add a join algorithm for string containers.
b5813cee cmInstallCommand: Remove unused variable.
Diffstat (limited to 'Source/cmSystemTools.cxx')
| -rw-r--r-- | Source/cmSystemTools.cxx | 18 |
1 files changed, 6 insertions, 12 deletions
diff --git a/Source/cmSystemTools.cxx b/Source/cmSystemTools.cxx index eea4986..c769154 100644 --- a/Source/cmSystemTools.cxx +++ b/Source/cmSystemTools.cxx @@ -824,18 +824,12 @@ bool cmSystemTools::RunSingleCommand( std::string cmSystemTools::PrintSingleCommand(std::vector<std::string> const& command) { - std::string commandStr; - const char* sep = ""; - for(std::vector<std::string>::const_iterator i = command.begin(); - i != command.end(); ++i) - { - commandStr += sep; - commandStr += "\""; - commandStr += *i; - commandStr += "\""; - sep = " "; - } - return commandStr; + if (command.empty()) + { + return std::string(); + } + + return "\"" + cmJoin(command, "\" \"") + "\""; } bool cmSystemTools::DoesFileExistWithExtensions( |