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

Merge topic 'vs-express-build-output' 

94887cb6 cmake: Teach --build to get VCExpress output (#15437)
This commit is contained in:
Brad King 2015-03-12 15:26:39 -04:00 committed by CMake Topic Stage
parent 18e85253c3 94887cb6f1
commit f25aa204a2
1 changed files with 13 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
Source/cmGlobalGenerator.cxx
View File

@ -1718,6 +1718,19 @@ int cmGlobalGenerator::Build(
std::string outputBuffer;
std::string* outputPtr = &outputBuffer;
std::vector<std::string> makeCommand;
this->GenerateBuildCommand(makeCommand, makeCommandCSTR, projectName,
bindir, target, config, fast, verbose,
nativeOptions);
// Workaround to convince VCExpress.exe to produce output.
if (outputflag == cmSystemTools::OUTPUT_PASSTHROUGH &&
!makeCommand.empty() && cmSystemTools::LowerCase(
cmSystemTools::GetFilenameName(makeCommand[0])) == "vcexpress.exe")
{
outputflag = cmSystemTools::OUTPUT_NORMAL;
}
// should we do a clean first?
if (clean)
{
@ -1744,10 +1757,6 @@ int cmGlobalGenerator::Build(
}
// now build
std::vector<std::string> makeCommand;
this->GenerateBuildCommand(makeCommand, makeCommandCSTR, projectName,
bindir, target, config, fast, verbose,
nativeOptions);
std::string makeCommandStr = cmSystemTools::PrintSingleCommand(makeCommand);
output += "\nRun Build Command:";
output += makeCommandStr;