BUG: Fix for spaces in path to build directory with new progress stuff.

1 files changed, 12 insertions, 8 deletions

diff --git a/Source/cmLocalUnixMakefileGenerator3.cxx b/Source/cmLocalUnixMakefileGenerator3.cxx
index e2d3f89..a4b1739 100644
--- a/Source/cmLocalUnixMakefileGenerator3.cxx
+++ b/Source/cmLocalUnixMakefileGenerator3.cxx
@@ -1410,12 +1410,14 @@ void cmLocalUnixMakefileGenerator3
 
   if (!this->Parent)
     {
-    cmGlobalUnixMakefileGenerator3 *gg = 
-      static_cast<cmGlobalUnixMakefileGenerator3*>(this->GlobalGenerator);
+    std::string progressDir = this->Makefile->GetHomeOutputDirectory();
+    progressDir += "/CMakeFiles";
     cmOStringStream progCmd;
     progCmd << "$(CMAKE_COMMAND) -E cmake_progress_start ";
-    progCmd << this->Makefile->GetHomeOutputDirectory();
-    progCmd << "/CMakeFiles 100";
+    progCmd << this->Convert(progressDir.c_str(),
+                             cmLocalGenerator::FULL,
+                             cmLocalGenerator::SHELL);
+    progCmd << " 100";
     commands.push_back(progCmd.str());
     }
 
@@ -1426,12 +1428,14 @@ void cmLocalUnixMakefileGenerator3
                                 this->Makefile->GetStartOutputDirectory());
   if (!this->Parent)
     {
-    cmGlobalUnixMakefileGenerator3 *gg = 
-      static_cast<cmGlobalUnixMakefileGenerator3*>(this->GlobalGenerator);
+    std::string progressDir = this->Makefile->GetHomeOutputDirectory();
+    progressDir += "/CMakeFiles";
     cmOStringStream progCmd;
     progCmd << "$(CMAKE_COMMAND) -E cmake_progress_start ";
-    progCmd << this->Makefile->GetHomeOutputDirectory();
-    progCmd << "/CMakeFiles 0";
+    progCmd << this->Convert(progressDir.c_str(),
+                             cmLocalGenerator::FULL,
+                             cmLocalGenerator::SHELL);
+    progCmd << " 0";
     commands.push_back(progCmd.str());
     }
   this->WriteMakeRule(ruleFileStream, "The main all target", "all",