kolan
/
CMake
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

ENH: line lengths

This commit is contained in:
Ken Martin 2006-06-05 14:32:12 -04:00
parent 503e2baafb
commit 7d5bc02c9d
3 changed files with 10 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
Source/cmDependsC.cxx
View File

@ -203,10 +203,10 @@ bool cmDependsC::WriteDependencies(const char *src, const char *obj,
for(std::set<cmStdString>::iterator i=dependencies.begin(); for(std::set<cmStdString>::iterator i=dependencies.begin();
i != dependencies.end(); ++i) i != dependencies.end(); ++i)
{ {
makeDepends << obj << ": " makeDepends << obj << ": " <<
<< this->LocalGenerator->Convert(i->c_str(), this->LocalGenerator->Convert(i->c_str(),
cmLocalGenerator::HOME_OUTPUT, cmLocalGenerator::HOME_OUTPUT,
cmLocalGenerator::MAKEFILE) cmLocalGenerator::MAKEFILE)
<< std::endl; << std::endl;
internalDepends << " " << i->c_str() << std::endl; internalDepends << " " << i->c_str() << std::endl;
} }

6
Source/cmGlobalUnixMakefileGenerator3.cxx
View File

@ -712,7 +712,8 @@ cmGlobalUnixMakefileGenerator3
{ {
// TODO: Convert the total progress count to a make variable. // TODO: Convert the total progress count to a make variable.
cmOStringStream progCmd; cmOStringStream progCmd;
progCmd << "$(CMAKE_COMMAND) -E cmake_progress_start "; // # in target progCmd << "$(CMAKE_COMMAND) -E cmake_progress_start ";
// # in target
progCmd << lg->Convert(progressDir.c_str(), progCmd << lg->Convert(progressDir.c_str(),
cmLocalGenerator::FULL, cmLocalGenerator::FULL,
cmLocalGenerator::SHELL); cmLocalGenerator::SHELL);
@ -847,7 +848,8 @@ cmGlobalUnixMakefileGenerator3
lg->GetMakefile()->GetHomeOutputDirectory(); lg->GetMakefile()->GetHomeOutputDirectory();
progressDir += "/CMakeFiles"; progressDir += "/CMakeFiles";
cmOStringStream progCmd; cmOStringStream progCmd;
progCmd << "$(CMAKE_COMMAND) -E cmake_progress_report "; // all target counts progCmd << "$(CMAKE_COMMAND) -E cmake_progress_report ";
// all target counts
progCmd << lg->Convert(progressDir.c_str(), progCmd << lg->Convert(progressDir.c_str(),
cmLocalGenerator::FULL, cmLocalGenerator::FULL,
cmLocalGenerator::SHELL); cmLocalGenerator::SHELL);

3
Source/cmMakefileTargetGenerator.cxx
View File

@ -838,7 +838,8 @@ void cmMakefileTargetGenerator::WriteTargetDriverRule(const char* main_output,
comment = "Rule to build all files generated by this target."; comment = "Rule to build all files generated by this target.";
// Make sure all custom command outputs in this target are built. // Make sure all custom command outputs in this target are built.
const std::vector<cmSourceFile*>& sources = this->Target->GetSourceFiles(); const std::vector<cmSourceFile*>& sources =
this->Target->GetSourceFiles();
for(std::vector<cmSourceFile*>::const_iterator source = sources.begin(); for(std::vector<cmSourceFile*>::const_iterator source = sources.begin();
source != sources.end(); ++source) source != sources.end(); ++source)
{ {