summaryrefslogtreecommitdiffstats
path: root/Source/cmMakefile.cxx
diff options
context:
space:
mode:
authorBrad King <brad.king@kitware.com>2019-08-20 13:18:41 (GMT)
committerKitware Robot <kwrobot@kitware.com>2019-08-20 13:20:49 (GMT)
commita0c8405d681d504f5d96489c2b5d44f10a29c6ed (patch)
tree260f79572b035b6791aa3d2480e729d6fffc0da9 /Source/cmMakefile.cxx
parentb80417f0fd1491d1c0f5d57019b47d4c13729545 (diff)
parent3c94069660112f841df3bae66891e05bfc7bad00 (diff)
downloadCMake-a0c8405d681d504f5d96489c2b5d44f10a29c6ed.zip
CMake-a0c8405d681d504f5d96489c2b5d44f10a29c6ed.tar.gz
CMake-a0c8405d681d504f5d96489c2b5d44f10a29c6ed.tar.bz2
Merge topic 'trace-redirect'
3c94069660 Add --trace-redirect parameter to redirect trace output to a file Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !3645
Diffstat (limited to 'Source/cmMakefile.cxx')
-rw-r--r--Source/cmMakefile.cxx9
1 files changed, 8 insertions, 1 deletions
diff --git a/Source/cmMakefile.cxx b/Source/cmMakefile.cxx
index 992fc1b..3c1bc38 100644
--- a/Source/cmMakefile.cxx
+++ b/Source/cmMakefile.cxx
@@ -23,6 +23,7 @@
#include "cmExpandedCommandArgument.h" // IWYU pragma: keep
#include "cmFileLockPool.h"
#include "cmFunctionBlocker.h"
+#include "cmGeneratedFileStream.h"
#include "cmGeneratorExpression.h"
#include "cmGeneratorExpressionEvaluationFile.h"
#include "cmGlobalGenerator.h"
@@ -321,7 +322,13 @@ void cmMakefile::PrintCommandTrace(const cmListFileFunction& lff) const
msg << " ";
}
msg << ")";
- cmSystemTools::Message(msg.str());
+
+ auto& f = this->GetCMakeInstance()->GetTraceFile();
+ if (f) {
+ f << msg.str() << '\n';
+ } else {
+ cmSystemTools::Message(msg.str());
+ }
}
// Helper class to make sure the call stack is valid.