[cmake-commits] king committed cmLocalUnixMakefileGenerator3.cxx 1.177 1.178

[cmake-commits at cmake.org]

Update of /cvsroot/CMake/CMake/Source
In directory public:/mounts/ram/cvs-serv10412

Modified Files:
	cmLocalUnixMakefileGenerator3.cxx 
Log Message:
BUG: Moved progress.make file into CMakeFiles subdirectory to keep things clean.


Index: cmLocalUnixMakefileGenerator3.cxx
===================================================================
RCS file: /cvsroot/CMake/CMake/Source/cmLocalUnixMakefileGenerator3.cxx,v
retrieving revision 1.177
retrieving revision 1.178
diff -u -d -r1.177 -r1.178
--- cmLocalUnixMakefileGenerator3.cxx	28 Sep 2006 13:49:40 -0000	1.177
+++ cmLocalUnixMakefileGenerator3.cxx	28 Sep 2006 21:21:50 -0000	1.178
@@ -161,8 +161,10 @@
 void cmLocalUnixMakefileGenerator3::WriteAllProgressVariable()
 {
   // write the top level progress for the all target
+  std::string progressFile = cmake::GetCMakeFilesDirectory();
+  progressFile += "/progress.make";
   std::string progressFileNameFull = 
-    this->ConvertToFullPath("progress.make");
+    this->ConvertToFullPath(progressFile.c_str());
   cmGeneratedFileStream ruleFileStream(progressFileNameFull.c_str());
   if(!ruleFileStream)
     {
@@ -1395,10 +1397,16 @@
   this->WriteSpecialTargetsTop(ruleFileStream);
 
   // Include the progress variables for the target.
+  std::string progressFile = cmake::GetCMakeFilesDirectory();
+  progressFile += "/progress.make";
+  std::string progressFileNameFull =
+    this->ConvertToFullPath(progressFile.c_str());
   ruleFileStream
     << "# Include the progress variables for this target.\n"
     << this->IncludeDirective << " "
-    << "progress.make\n\n";
+    << this->Convert(progressFileNameFull.c_str(),
+                     cmLocalGenerator::HOME_OUTPUT,
+                     cmLocalGenerator::MAKEFILE) << "\n\n";
   
   // Write all global targets
   this->WriteDivider(ruleFileStream);