|
@@ -1717,6 +1717,19 @@ int cmGlobalGenerator::Build(
|
|
|
std::string outputBuffer;
|
|
std::string outputBuffer;
|
|
|
std::string* outputPtr = &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?
|
|
// should we do a clean first?
|
|
|
if (clean)
|
|
if (clean)
|
|
|
{
|
|
{
|
|
@@ -1743,10 +1756,6 @@ int cmGlobalGenerator::Build(
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
// now 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);
|
|
std::string makeCommandStr = cmSystemTools::PrintSingleCommand(makeCommand);
|
|
|
output += "\nRun Build Command:";
|
|
output += "\nRun Build Command:";
|
|
|
output += makeCommandStr;
|
|
output += makeCommandStr;
|