mirror/CMake
1
0
Fork 0
mirror of https://github.com/Kitware/CMake.git synced 2026-01-05 21:31:08 -06:00
Code Issues Packages Projects Releases Wiki Activity

cmTryRunCommand: Factor out stdout/stderr capture conditions

Browse Source
This commit is contained in:
Brad King
2022-12-12 13:05:53 -05:00
parent fdda4095a3
commit 8d29a0bda6
1 changed files with 8 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
Source/cmTryRunCommand.cxx
View File

@@ -96,14 +96,16 @@ bool TryRunCommandImpl::TryRunCode(std::vector<std::string> const& argv)
}
bool captureRunOutput = false;
bool captureRunOutputStdOutErr = false;
bool captureRunOutputStdOut = false;
bool captureRunOutputStdErr = false;
if (arguments.OutputVariable) {
captureRunOutput = true;
} else if (arguments.CompileOutputVariable) {
arguments.OutputVariable = arguments.CompileOutputVariable;
}
if (arguments.RunOutputStdOutVariable || arguments.RunOutputStdErrVariable) {
captureRunOutputStdOutErr = true;
captureRunOutputStdOut = arguments.RunOutputStdOutVariable.has_value();
captureRunOutputStdErr = arguments.RunOutputStdErrVariable.has_value();
} else if (arguments.RunOutputVariable) {
captureRunOutput = true;
}
@@ -132,22 +134,14 @@ bool TryRunCommandImpl::TryRunCode(std::vector<std::string> const& argv)
runArgs, *arguments.SourceDirectoryOrFile,
*arguments.CompileResultVariable,
captureRunOutput ? &runOutputContents : nullptr,
captureRunOutputStdOutErr && arguments.RunOutputStdOutVariable
? &runOutputStdOutContents
: nullptr,
captureRunOutputStdOutErr && arguments.RunOutputStdErrVariable
? &runOutputStdErrContents
: nullptr);
captureRunOutputStdOut ? &runOutputStdOutContents : nullptr,
captureRunOutputStdErr ? &runOutputStdErrContents : nullptr);
} else {
this->RunExecutable(
runArgs, arguments.RunWorkingDirectory,
captureRunOutput ? &runOutputContents : nullptr,
captureRunOutputStdOutErr && arguments.RunOutputStdOutVariable
? &runOutputStdOutContents
: nullptr,
captureRunOutputStdOutErr && arguments.RunOutputStdErrVariable
? &runOutputStdErrContents
: nullptr);
captureRunOutputStdOut ? &runOutputStdOutContents : nullptr,
captureRunOutputStdErr ? &runOutputStdErrContents : nullptr);
}
// now put the output into the variables