[cmake-commits] king committed cmMakefileExecutableTargetGenerator.cxx 1.25 1.26 cmMakefileLibraryTargetGenerator.cxx 1.30 1.31

[cmake-commits at cmake.org]

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

Modified Files:
	cmMakefileExecutableTargetGenerator.cxx 
	cmMakefileLibraryTargetGenerator.cxx 
Log Message:
BUG: Do not clean the .pdb file for a target just before it is linked!  This finishes addressing bug#4341.


Index: cmMakefileLibraryTargetGenerator.cxx
===================================================================
RCS file: /cvsroot/CMake/CMake/Source/cmMakefileLibraryTargetGenerator.cxx,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -d -r1.30 -r1.31
--- cmMakefileLibraryTargetGenerator.cxx	1 Feb 2007 14:57:24 -0000	1.30
+++ cmMakefileLibraryTargetGenerator.cxx	1 Feb 2007 21:52:52 -0000	1.31
@@ -401,7 +401,11 @@
           cmLocalGenerator::START_OUTPUT,
           cmLocalGenerator::UNCHANGED));
       }
-    libCleanFiles.push_back
+
+    // List the PDB for cleaning only when the whole target is
+    // cleaned.  We do not want to delete the .pdb file just before
+    // linking the target.
+    this->CleanFiles.push_back
       (this->Convert(cleanFullPDBName.c_str(),
                      cmLocalGenerator::START_OUTPUT,
                      cmLocalGenerator::UNCHANGED));

Index: cmMakefileExecutableTargetGenerator.cxx
===================================================================
RCS file: /cvsroot/CMake/CMake/Source/cmMakefileExecutableTargetGenerator.cxx,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -d -r1.25 -r1.26
--- cmMakefileExecutableTargetGenerator.cxx	1 Feb 2007 21:07:32 -0000	1.25
+++ cmMakefileExecutableTargetGenerator.cxx	1 Feb 2007 21:52:52 -0000	1.26
@@ -293,9 +293,14 @@
                                           cmLocalGenerator::START_OUTPUT,
                                           cmLocalGenerator::UNCHANGED));
     }
-  exeCleanFiles.push_back(this->Convert(cleanFullPDBName.c_str(),
-                                        cmLocalGenerator::START_OUTPUT,
-                                        cmLocalGenerator::UNCHANGED));
+
+  // List the PDB for cleaning only when the whole target is
+  // cleaned.  We do not want to delete the .pdb file just before
+  // linking the target.
+  this->CleanFiles.push_back
+    (this->Convert(cleanFullPDBName.c_str(),
+                   cmLocalGenerator::START_OUTPUT,
+                   cmLocalGenerator::UNCHANGED));
   }
 
   // Add a command to remove any existing files for this executable.