diff options
| author | Andy Cedilnik <andy.cedilnik@kitware.com> | 2005-05-04 15:13:00 (GMT) |
|---|---|---|
| committer | Andy Cedilnik <andy.cedilnik@kitware.com> | 2005-05-04 15:13:00 (GMT) |
| commit | 082b3b44d73b19aa1461eaa91e228317d9373d67 (patch) | |
| tree | b7f2e0dcc0574d8f08d76d30a6b988665cb20c2e /Source/cmGlobalGenerator.cxx | |
| parent | 214269f095e64df2131b59a9b16bc6f71717894d (diff) | |
| download | CMake-082b3b44d73b19aa1461eaa91e228317d9373d67.zip CMake-082b3b44d73b19aa1461eaa91e228317d9373d67.tar.gz CMake-082b3b44d73b19aa1461eaa91e228317d9373d67.tar.bz2 | |
BUG: Fix bootstrap test on machines with spaces in the path
Diffstat (limited to 'Source/cmGlobalGenerator.cxx')
| -rw-r--r-- | Source/cmGlobalGenerator.cxx | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/Source/cmGlobalGenerator.cxx b/Source/cmGlobalGenerator.cxx index e676bbb..9ebdcad 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 |