diff options
| author | Brad King <brad.king@kitware.com> | 2015-02-05 21:48:16 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2015-02-06 13:36:51 (GMT) |
| commit | 8521fdf56e4908676c28c6bbdda3f1fb2284d3d7 (patch) | |
| tree | c3df791d24c06b677cf09bd02c3e791534272ccc /Source/cmMakefileTargetGenerator.h | |
| parent | 69ac6d27555cd4819d0c7f40e4471c6f885e23ab (diff) | |
| download | CMake-8521fdf56e4908676c28c6bbdda3f1fb2284d3d7.zip CMake-8521fdf56e4908676c28c6bbdda3f1fb2284d3d7.tar.gz CMake-8521fdf56e4908676c28c6bbdda3f1fb2284d3d7.tar.bz2 | |
Makefile: Fix output during parallel builds (#12991)
Replace use of separate "cmake -E cmake_progress_report" and "cmake -E
cmake_echo_color" commands to report the progress and message portions
of build output lines with --progress-* options to the latter to print
everything with a single command. The line buffering of the stdout FILE
stream should cause the whole line to be printed with one atomic write.
This will avoid inter-mixing of line-wise messages from different
processes during a parallel build.
Diffstat (limited to 'Source/cmMakefileTargetGenerator.h')
| -rw-r--r-- | Source/cmMakefileTargetGenerator.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Source/cmMakefileTargetGenerator.h b/Source/cmMakefileTargetGenerator.h index e31e086..b072cfa 100644 --- a/Source/cmMakefileTargetGenerator.h +++ b/Source/cmMakefileTargetGenerator.h @@ -109,7 +109,7 @@ protected: void GenerateExtraOutput(const char* out, const char* in, bool symbolic = false); - void AppendProgress(std::vector<std::string>& commands); + void MakeEchoProgress(cmLocalUnixMakefileGenerator3::EchoProgress&) const; // write out the variable that lists the objects for this target void WriteObjectsVariable(std::string& variableName, |