diff options
| author | Brad King <brad.king@kitware.com> | 2016-01-21 18:55:47 (GMT) |
|---|---|---|
| committer | CMake Topic Stage <kwrobot@kitware.com> | 2016-01-21 18:55:47 (GMT) |
| commit | 563a6c7be09c73bdd7e0ee7b0c52dd9bbc20c50a (patch) | |
| tree | 544da7508f62fb5cc78a3d4d3cd80289ee784b7f /Source | |
| parent | 071c94eeac9811c8dbe7b6e627899051f1a18ec4 (diff) | |
| parent | 1787269ef3c476ee1176c92c54e5b22f9cb7f3fe (diff) | |
| download | CMake-563a6c7be09c73bdd7e0ee7b0c52dd9bbc20c50a.zip CMake-563a6c7be09c73bdd7e0ee7b0c52dd9bbc20c50a.tar.gz CMake-563a6c7be09c73bdd7e0ee7b0c52dd9bbc20c50a.tar.bz2 | |
Merge topic 'cmake-E-time-quoting'
1787269e cmake: Fix `-E time` argument passing to child
Diffstat (limited to 'Source')
| -rw-r--r-- | Source/cmcmd.cxx | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Source/cmcmd.cxx b/Source/cmcmd.cxx index 8dd902b..1dc304c 100644 --- a/Source/cmcmd.cxx +++ b/Source/cmcmd.cxx @@ -554,7 +554,7 @@ int cmcmd::ExecuteCMakeCommand(std::vector<std::string>& args) // Clock command else if (args[1] == "time" && args.size() > 2) { - std::string command = cmJoin(cmMakeRange(args).advance(2), " "); + std::vector<std::string> command(args.begin()+2, args.end()); clock_t clock_start, clock_finish; time_t time_start, time_finish; @@ -562,7 +562,7 @@ int cmcmd::ExecuteCMakeCommand(std::vector<std::string>& args) time(&time_start); clock_start = clock(); int ret =0; - cmSystemTools::RunSingleCommand(command.c_str(), 0, 0, &ret); + cmSystemTools::RunSingleCommand(command, 0, 0, &ret); clock_finish = clock(); time(&time_finish); |