kolan/CMake
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

cmcmd: Improve error handling when executing a process.

Browse Source
This commit is contained in:
James Johnston 2015-08-08 01:06:27 -04:00
parent b28b07db47
commit 203b20df98
1 changed files with 14 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
Source/cmcmd.cxx
View File

@ -1468,18 +1468,24 @@ bool cmcmd::RunCommand(const char* comment,
std::string output; std::string output;
int retCode =0; int retCode =0;
// use rc command to create .res file // use rc command to create .res file
cmSystemTools::RunSingleCommand(command, bool res = cmSystemTools::RunSingleCommand(command,
&output, &output, &output, &output,
&retCode, 0, cmSystemTools::OUTPUT_NONE); &retCode, 0,
cmSystemTools::OUTPUT_NONE);
// always print the output of the command, unless // always print the output of the command, unless
// it is the dumb rc command banner, but if the command // it is the dumb rc command banner, but if the command
// returned an error code then print the output anyway as // returned an error code then print the output anyway as
// the banner may be mixed with some other important information. // the banner may be mixed with some other important information.
if(output.find("Resource Compiler Version") == output.npos if(output.find("Resource Compiler Version") == output.npos
|| retCode !=0) || !res || retCode)
{ {
std::cout << output; std::cout << output;
} }
if (!res)
{
std::cout << comment << " failed to run." << std::endl;
return false;
}
// if retCodeOut is requested then always return true // if retCodeOut is requested then always return true
// and set the retCodeOut to retCode // and set the retCodeOut to retCode
if(retCodeOut) if(retCodeOut)
@ -1593,7 +1599,10 @@ int cmcmd::VisualStudioLinkIncremental(std::vector<std::string>& args,
mtCommand.push_back(tempManifest); mtCommand.push_back(tempManifest);
// now run mt.exe to create the final manifest file // now run mt.exe to create the final manifest file
int mtRet =0; int mtRet =0;
cmcmd::RunCommand("MT", mtCommand, verbose, &mtRet); if(!cmcmd::RunCommand("MT", mtCommand, verbose, &mtRet))
{
return -1;
}
// if mt returns 0, then the manifest was not changed and // if mt returns 0, then the manifest was not changed and
// we do not need to do another link step // we do not need to do another link step
if(mtRet == 0) if(mtRet == 0)