[cmake-commits] king committed cmake.cxx 1.286 1.287 cmLocalGenerator.cxx 1.195 1.196 cmLocalGenerator.h 1.75 1.76 cmGlobalUnixMakefileGenerator3.cxx 1.98 1.99

[cmake-commits at cmake.org]

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

Modified Files:
	cmake.cxx cmLocalGenerator.cxx cmLocalGenerator.h 
	cmGlobalUnixMakefileGenerator3.cxx 
Log Message:
ENH: SetupPathConversions is now called automatically on demand.


Index: cmLocalGenerator.cxx
===================================================================
RCS file: /cvsroot/CMake/CMake/Source/cmLocalGenerator.cxx,v
retrieving revision 1.195
retrieving revision 1.196
diff -u -d -r1.195 -r1.196
--- cmLocalGenerator.cxx	7 Mar 2007 22:39:16 -0000	1.195
+++ cmLocalGenerator.cxx	8 Mar 2007 13:38:40 -0000	1.196
@@ -48,6 +48,7 @@
   this->Configured = false;
   this->EmitUniversalBinaryFlags = true;
   this->RelativePathsConfigured = false;
+  this->PathConversionsSetup = false;
 }
 
 cmLocalGenerator::~cmLocalGenerator()
@@ -80,9 +81,7 @@
       this->Makefile->ConfigureSubDirectory(*sdi);
       }
     }  
-  
-  this->SetupPathConversions();
-  
+
   // Check whether relative paths should be used for optionally
   // relative paths.
   this->UseRelativePaths = this->Makefile->IsOn("CMAKE_USE_RELATIVE_PATHS");
@@ -2014,6 +2013,13 @@
                                       OutputFormat output,
                                       bool optional)
 {
+  // Make sure the relative path conversion components are set.
+  if(!this->PathConversionsSetup)
+    {
+    this->SetupPathConversions();
+    this->PathConversionsSetup = true;
+    }
+
   // Convert the path to a relative path.
   std::string result = source;
 

Index: cmGlobalUnixMakefileGenerator3.cxx
===================================================================
RCS file: /cvsroot/CMake/CMake/Source/cmGlobalUnixMakefileGenerator3.cxx,v
retrieving revision 1.98
retrieving revision 1.99
diff -u -d -r1.98 -r1.99
--- cmGlobalUnixMakefileGenerator3.cxx	10 Oct 2006 17:47:50 -0000	1.98
+++ cmGlobalUnixMakefileGenerator3.cxx	8 Mar 2007 13:38:40 -0000	1.99
@@ -597,7 +597,6 @@
       lg->GetMakefile()->MakeStartDirectoriesCurrent();
       }
     
-    lg->SetupPathConversions();
     makeCommand += " \"";
     std::string tname = targetName;
     if(fast)

Index: cmLocalGenerator.h
===================================================================
RCS file: /cvsroot/CMake/CMake/Source/cmLocalGenerator.h,v
retrieving revision 1.75
retrieving revision 1.76
diff -u -d -r1.75 -r1.76
--- cmLocalGenerator.h	7 Mar 2007 22:32:35 -0000	1.75
+++ cmLocalGenerator.h	8 Mar 2007 13:38:40 -0000	1.76
@@ -102,9 +102,6 @@
                       OutputFormat output = UNCHANGED,
                       bool optional = false);
   
-  ///! Call this prior to using Convert
-  void SetupPathConversions();
-  
   /**
    * Convert the given path to an output path that is optionally
    * relative based on the cache option CMAKE_USE_RELATIVE_PATHS.  The
@@ -279,6 +276,7 @@
   void ConfigureRelativePaths();
   std::string FindRelativePathTopSource();
   std::string FindRelativePathTopBinary();
+  void SetupPathConversions();
 
   cmMakefile *Makefile;
   cmGlobalGenerator *GlobalGenerator;
@@ -314,6 +312,7 @@
   std::string RelativePathTopSource;
   std::string RelativePathTopBinary;
   bool RelativePathsConfigured;
+  bool PathConversionsSetup;
 };
 
 #endif

Index: cmake.cxx
===================================================================
RCS file: /cvsroot/CMake/CMake/Source/cmake.cxx,v
retrieving revision 1.286
retrieving revision 1.287
diff -u -d -r1.286 -r1.287
--- cmake.cxx	2 Mar 2007 15:49:32 -0000	1.286
+++ cmake.cxx	8 Mar 2007 13:38:40 -0000	1.287
@@ -1210,7 +1210,6 @@
         lgd->GetMakefile()->SetStartDirectory(startDir.c_str());
         lgd->GetMakefile()->SetStartOutputDirectory(startOutDir.c_str());
         lgd->GetMakefile()->MakeStartDirectoriesCurrent();
-        lgd->SetupPathConversions();
 
         // Actually scan dependencies.
         return lgd->ScanDependencies(depInfo.c_str())? 0 : 2;