[cmake-commits] hoffman committed SystemTools.cxx 1.157.2.12 1.157.2.13

cmake-commits at cmake.org cmake-commits at cmake.org
Fri Mar 16 17:05:45 EST 2007


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

Modified Files:
      Tag: CMake-2-4
	SystemTools.cxx 
Log Message:
ENH: check in fixes from main tree to create 2.4.7 RC 5


Index: SystemTools.cxx
===================================================================
RCS file: /cvsroot/CMake/CMake/Source/kwsys/SystemTools.cxx,v
retrieving revision 1.157.2.12
retrieving revision 1.157.2.13
diff -u -d -r1.157.2.12 -r1.157.2.13
--- SystemTools.cxx	15 Feb 2007 17:45:08 -0000	1.157.2.12
+++ SystemTools.cxx	16 Mar 2007 22:05:42 -0000	1.157.2.13
@@ -2660,13 +2660,24 @@
     remoteSplit[sameCount] = "";
     sameCount++;
     }
+
+#if 0
+  // NOTE: We did this at one time to prevent relative paths to the
+  // compiler from looking like "../../../../../../../usr/bin/gcc".
+  // Now however relative paths are only computed for destinations
+  // inside the build tree so this is not a problem.  This is now a
+  // general-purpose method and should not have this hack.  I'm
+  // leaving it in place in case removing it causes a problem so it is
+  // easy to restore:
+  //
   // If there is nothing in common but the root directory, then just
   // return the full path.
   if(sameCount <= 1)
     {
     return remote;
     }
-  
+#endif
+
   // for each entry that is not common in the local path
   // add a ../ to the finalpath array, this gets us out of the local
   // path into the remote dir



More information about the Cmake-commits mailing list