mirror/CMake
1
0
Fork 0
mirror of https://github.com/Kitware/CMake.git synced 2026-05-03 21:00:01 -05:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Brad King
2006-05-23 09:58:10 -04:00
parent 50d058a3a1
commit 15535c3f60
3 changed files with 32 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Source/cmGlobalUnixMakefileGenerator3.cxx
+14 -5
View File
@@ -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)