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, 9 insertions, 2 deletions

diff --git a/Source/cmGlobalGenerator.cxx b/Source/cmGlobalGenerator.cxx
index d9d0ba4..cc02b14 100644
--- a/Source/cmGlobalGenerator.cxx
+++ b/Source/cmGlobalGenerator.cxx
@@ -589,8 +589,6 @@ void cmGlobalGenerator::Configure()
     }
   this->LocalGenerators.clear();
 
-  // Setup relative path generation.
-  this->ConfigureRelativePaths();
   this->TotalTargets.clear();
   
   // start with this directory
@@ -1219,6 +1217,15 @@ inline std::string removeQuotes(const std::string& s)
   return s;
 }
 
+void cmGlobalGenerator::SetCMakeInstance(cmake* cm)
+{
+  // Store a pointer to the cmake object instance.
+  this->CMakeInstance = cm;
+
+  // Setup relative path conversion for the instance.
+  this->ConfigureRelativePaths();
+}
+
 void cmGlobalGenerator::SetupTests()
 {
   std::string ctest = this->LocalGenerators[0]->GetMakefile()->