[cmake-commits] king committed cmGlobalXCodeGenerator.cxx 1.135 1.136 cmLocalGenerator.h 1.73 1.74

[cmake-commits at cmake.org]

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

Modified Files:
	cmGlobalXCodeGenerator.cxx cmLocalGenerator.h 
Log Message:
COMP: Fix ConvertToRelativePath change for Xcode generator.


Index: cmGlobalXCodeGenerator.cxx
===================================================================
RCS file: /cvsroot/CMake/CMake/Source/cmGlobalXCodeGenerator.cxx,v
retrieving revision 1.135
retrieving revision 1.136
diff -u -d -r1.135 -r1.136
--- cmGlobalXCodeGenerator.cxx	21 Feb 2007 19:01:19 -0000	1.135
+++ cmGlobalXCodeGenerator.cxx	7 Mar 2007 21:32:29 -0000	1.136
@@ -2539,7 +2539,8 @@
   else
     {
     std::string ret = 
-      this->ConvertToRelativePath(this->CurrentOutputDirectoryComponents, p);
+      this->CurrentLocalGenerator->
+        ConvertToRelativePath(this->CurrentOutputDirectoryComponents, p);
     return cmSystemTools::ConvertToOutputPath(ret.c_str());
     }
 }
@@ -2554,7 +2555,8 @@
   else
     {
     std::string ret = 
-      this->ConvertToRelativePath(this->ProjectOutputDirectoryComponents, p);
+      this->CurrentLocalGenerator->
+        ConvertToRelativePath(this->ProjectOutputDirectoryComponents, p);
     return cmSystemTools::ConvertToOutputPath(ret.c_str());
     }
 }

Index: cmLocalGenerator.h
===================================================================
RCS file: /cvsroot/CMake/CMake/Source/cmLocalGenerator.h,v
retrieving revision 1.73
retrieving revision 1.74
diff -u -d -r1.73 -r1.74
--- cmLocalGenerator.h	7 Mar 2007 20:15:46 -0000	1.73
+++ cmLocalGenerator.h	7 Mar 2007 21:32:29 -0000	1.74
@@ -219,6 +219,16 @@
   // return the source name for the object file
   virtual std::string GetSourceObjectName(cmSourceFile& );
   
+  /**
+   * Convert the given remote path to a relative path with respect to
+   * the given local path.  The local path must be given in component
+   * form (see SystemTools::SplitPath) without a trailing slash.  The
+   * remote path must use forward slashes and not already be escaped
+   * or quoted.
+   */
+  std::string ConvertToRelativePath(const std::vector<std::string>& local,
+                                    const char* remote);
+
 protected:
 
   /** Construct a comment for a custom command.  */
@@ -268,16 +278,6 @@
 
   void ConfigureRelativePaths();
 
-  /**
-   * Convert the given remote path to a relative path with respect to
-   * the given local path.  The local path must be given in component
-   * form (see SystemTools::SplitPath) without a trailing slash.  The
-   * remote path must use forward slashes and not already be escaped
-   * or quoted.
-   */
-  std::string ConvertToRelativePath(const std::vector<std::string>& local,
-                                    const char* remote);
-
   cmMakefile *Makefile;
   cmGlobalGenerator *GlobalGenerator;
   // members used for relative path function ConvertToMakefilePath