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

BUG: Fix bootstrap test on machines with spaces in the path

This commit is contained in:
Andy Cedilnik 2005-05-04 11:13:00 -04:00
parent 214269f095
commit 082b3b44d7
1 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
Source/cmGlobalGenerator.cxx
View File

@ -658,7 +658,8 @@ std::string cmGlobalGenerator::GenerateBuildCommand(const char* makeProgram,
(void)projectName; (void)projectName;
(void)config; (void)config;
std::string makeCommand = makeProgram; std::string makeCommand = cmSystemTools::ConvertToUnixOutputPath(makeProgram);
// Since we have full control over the invocation of nmake, let us // Since we have full control over the invocation of nmake, let us
// make it quiet. // make it quiet.
if ( strcmp(this->GetName(), "NMake Makefiles") == 0 ) if ( strcmp(this->GetName(), "NMake Makefiles") == 0 )
@ -725,10 +726,12 @@ int cmGlobalGenerator::Build(
&retVal, 0, false, timeout)) &retVal, 0, false, timeout))
{ {
cmSystemTools::SetRunCommandHideConsole(hideconsole); cmSystemTools::SetRunCommandHideConsole(hideconsole);
cmSystemTools::Error("Generator: execution of make failed."); cmSystemTools::Error("Generator: execution of make failed. Make command was: ",
makeCommand.c_str());
if (output) if (output)
{ {
*output += "\nGenerator: execution of make failed.\n"; *output += "\nGenerator: execution of make failed. Make command was: " +
makeCommand + "\n";
} }
// return to the original directory // return to the original directory