From 082b3b44d73b19aa1461eaa91e228317d9373d67 Mon Sep 17 00:00:00 2001 From: Andy Cedilnik Date: Wed, 4 May 2005 11:13:00 -0400 Subject: [PATCH] BUG: Fix bootstrap test on machines with spaces in the path --- Source/cmGlobalGenerator.cxx | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/Source/cmGlobalGenerator.cxx b/Source/cmGlobalGenerator.cxx index e676bbbce..9ebdcadd0 100644 --- a/Source/cmGlobalGenerator.cxx +++ b/Source/cmGlobalGenerator.cxx @@ -658,7 +658,8 @@ std::string cmGlobalGenerator::GenerateBuildCommand(const char* makeProgram, (void)projectName; (void)config; - std::string makeCommand = makeProgram; + std::string makeCommand = cmSystemTools::ConvertToUnixOutputPath(makeProgram); + // Since we have full control over the invocation of nmake, let us // make it quiet. if ( strcmp(this->GetName(), "NMake Makefiles") == 0 ) @@ -725,10 +726,12 @@ int cmGlobalGenerator::Build( &retVal, 0, false, timeout)) { 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) { - *output += "\nGenerator: execution of make failed.\n"; + *output += "\nGenerator: execution of make failed. Make command was: " + + makeCommand + "\n"; } // return to the original directory