BUG: Updated Makefile dependency scanning to provide a full local generator to the dependency scanner to do proper path conversions. This allows the rules written into the depend.make files to use the same relative path conversion as those written into the build.make files. Several previous changes added more and more information for use by the dependency scanner and it was converging to having the full local generator anyway.

1 files changed, 10 insertions, 9 deletions

diff --git a/Source/cmDepends.h b/Source/cmDepends.h
index ceb78be..b6eda70 100644
--- a/Source/cmDepends.h
+++ b/Source/cmDepends.h
@@ -20,6 +20,7 @@
 #include "cmStandardIncludes.h"
 
 class cmFileTimeComparison;
+class cmLocalGenerator;
 
 /** \class cmDepends
  * \brief Dependency scanner superclass.
@@ -37,13 +38,13 @@ public:
   
   /** at what level will the compile be done from */
   void SetCompileDirectory(const char *dir) {this->CompileDirectory = dir;};
-  
-  /** Set the full path to the top of the build tree.  This is
-      the base path from which dependencies are referenced as
-      relative paths.  */
-  void SetHomeOutputDirectory(const char *dir) {
-    this->HomeOutputDirectory = dir;};
-    
+
+  /** Set the local generator for the directory in which we are
+      scanning dependencies.  This is not a full local generator; it
+      has been setup to do relative path conversions for the current
+      directory.  */
+  void SetLocalGenerator(cmLocalGenerator* lg) { this->LocalGenerator = lg; }
+
   /** should this be verbose in its output */
   void SetVerbose(bool verb) { this->Verbose = verb; }
     
@@ -79,8 +80,8 @@ protected:
   // The directory in which the build rule for the target file is executed.
   std::string CompileDirectory;
 
-  // The full path to the top of the build tree.
-  std::string HomeOutputDirectory;
+  // The local generator.
+  cmLocalGenerator* LocalGenerator;
 
   // Flag for verbose output.
   bool Verbose;