diff options
| -rw-r--r-- | Source/cmDependsC.cxx | 8 | ||||
| -rw-r--r-- | Source/cmGlobalUnixMakefileGenerator3.cxx | 6 | ||||
| -rw-r--r-- | Source/cmMakefileTargetGenerator.cxx | 3 |
3 files changed, 10 insertions, 7 deletions
diff --git a/Source/cmDependsC.cxx b/Source/cmDependsC.cxx index 1a74f5c..7806ab3 100644 --- a/Source/cmDependsC.cxx +++ b/Source/cmDependsC.cxx @@ -203,10 +203,10 @@ bool cmDependsC::WriteDependencies(const char *src, const char *obj, for(std::set<cmStdString>::iterator i=dependencies.begin(); i != dependencies.end(); ++i) { - makeDepends << obj << ": " - << this->LocalGenerator->Convert(i->c_str(), - cmLocalGenerator::HOME_OUTPUT, - cmLocalGenerator::MAKEFILE) + makeDepends << obj << ": " << + this->LocalGenerator->Convert(i->c_str(), + cmLocalGenerator::HOME_OUTPUT, + cmLocalGenerator::MAKEFILE) << std::endl; internalDepends << " " << i->c_str() << std::endl; } diff --git a/Source/cmGlobalUnixMakefileGenerator3.cxx b/Source/cmGlobalUnixMakefileGenerator3.cxx index b86da5a..b3b7e6b 100644 --- a/Source/cmGlobalUnixMakefileGenerator3.cxx +++ b/Source/cmGlobalUnixMakefileGenerator3.cxx @@ -712,7 +712,8 @@ cmGlobalUnixMakefileGenerator3 { // TODO: Convert the total progress count to a make variable. 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(), cmLocalGenerator::FULL, cmLocalGenerator::SHELL); @@ -847,7 +848,8 @@ cmGlobalUnixMakefileGenerator3 lg->GetMakefile()->GetHomeOutputDirectory(); progressDir += "/CMakeFiles"; 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(), cmLocalGenerator::FULL, cmLocalGenerator::SHELL); diff --git a/Source/cmMakefileTargetGenerator.cxx b/Source/cmMakefileTargetGenerator.cxx index 5a6df64..c5bf92d 100644 --- a/Source/cmMakefileTargetGenerator.cxx +++ b/Source/cmMakefileTargetGenerator.cxx @@ -838,7 +838,8 @@ void cmMakefileTargetGenerator::WriteTargetDriverRule(const char* main_output, comment = "Rule to build all files generated by this target."; // 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(); source != sources.end(); ++source) { |