[cmake-commits] king committed SystemTools.cxx 1.193 1.194

cmake-commits at cmake.org cmake-commits at cmake.org
Thu Feb 22 15:27:58 EST 2007


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

Modified Files:
	SystemTools.cxx 
Log Message:
BUG: Fix bug#4482.


Index: SystemTools.cxx
===================================================================
RCS file: /cvsroot/CMake/CMake/Source/kwsys/SystemTools.cxx,v
retrieving revision 1.193
retrieving revision 1.194
diff -u -d -r1.193 -r1.194
--- SystemTools.cxx	22 Feb 2007 14:48:19 -0000	1.193
+++ SystemTools.cxx	22 Feb 2007 20:27:56 -0000	1.194
@@ -2693,13 +2693,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