diff options
| author | Brad King <brad.king@kitware.com> | 2006-05-23 13:58:10 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2006-05-23 13:58:10 (GMT) |
| commit | 15535c3f6003032bcebf2a477069c8f1df5bc394 (patch) | |
| tree | 6ff06551a5c3a245a6355dad339a354e24741b3e /Source/cmGlobalUnixMakefileGenerator3.cxx | |
| parent | 50d058a3a1ed4fbb1a1df29ae9979d8c9812ceef (diff) | |
| download | CMake-15535c3f6003032bcebf2a477069c8f1df5bc394.zip CMake-15535c3f6003032bcebf2a477069c8f1df5bc394.tar.gz CMake-15535c3f6003032bcebf2a477069c8f1df5bc394.tar.bz2 | |
BUG: Fix for spaces in path to build directory with new progress stuff.
Diffstat (limited to 'Source/cmGlobalUnixMakefileGenerator3.cxx')
| -rw-r--r-- | Source/cmGlobalUnixMakefileGenerator3.cxx | 19 |
1 files changed, 14 insertions, 5 deletions
diff --git a/Source/cmGlobalUnixMakefileGenerator3.cxx b/Source/cmGlobalUnixMakefileGenerator3.cxx index 4be48c9..805545a 100644 --- a/Source/cmGlobalUnixMakefileGenerator3.cxx +++ b/Source/cmGlobalUnixMakefileGenerator3.cxx @@ -699,11 +699,15 @@ cmGlobalUnixMakefileGenerator3 // Write the rule. commands.clear(); + std::string progressDir = + lg->GetMakefile()->GetHomeOutputDirectory(); + progressDir += "/CMakeFiles"; cmOStringStream progCmd; progCmd << "$(CMAKE_COMMAND) -E cmake_progress_start "; - progCmd << lg->GetMakefile()->GetHomeOutputDirectory(); - progCmd << "/CMakeFiles "; - progCmd << + progCmd << lg->Convert(progressDir.c_str(), + cmLocalGenerator::FULL, + cmLocalGenerator::SHELL); + progCmd << " " << (100*this->GetTargetTotalNumberOfSourceFiles(t->second))/ this->GetNumberOfSourceFiles(); commands.push_back(progCmd.str()); @@ -824,10 +828,15 @@ cmGlobalUnixMakefileGenerator3 localName += "/all"; depends.clear(); + std::string progressDir = + lg->GetMakefile()->GetHomeOutputDirectory(); + progressDir += "/CMakeFiles"; cmOStringStream progCmd; progCmd << "$(CMAKE_COMMAND) -E cmake_progress_report "; - progCmd << lg->GetMakefile()->GetHomeOutputDirectory(); - progCmd << "/CMakeFiles "; + progCmd << lg->Convert(progressDir.c_str(), + cmLocalGenerator::FULL, + cmLocalGenerator::SHELL); + progCmd << " "; std::vector<int> &progFiles = lg->ProgressFiles[t->first]; for (std::vector<int>::iterator i = progFiles.begin(); i != progFiles.end(); ++i) |