[cmake-commits] hoffman committed cmLocalGenerator.cxx 1.171 1.172

[cmake-commits at cmake.org]

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

Modified Files:
	cmLocalGenerator.cxx 
Log Message:
ENH: do not use crazy long paths to object files for try compile


Index: cmLocalGenerator.cxx
===================================================================
RCS file: /cvsroot/CMake/CMake/Source/cmLocalGenerator.cxx,v
retrieving revision 1.171
retrieving revision 1.172
diff -u -d -r1.171 -r1.172
--- cmLocalGenerator.cxx	23 Jan 2007 19:28:40 -0000	1.171
+++ cmLocalGenerator.cxx	31 Jan 2007 21:49:25 -0000	1.172
@@ -2286,6 +2286,16 @@
       objectName = relFromSource;
       }
     }
+  // if it is still a full path check for the try compile case
+  // try compile never have in source sources, and should not
+  // have conflicting source file names in the same target
+  if(cmSystemTools::FileIsFullPath(objectName.c_str()))
+    {
+    if(this->GetGlobalGenerator()->GetCMakeInstance()->GetIsInTryCompile())
+      {
+      objectName = cmSystemTools::GetFilenameName(source.GetFullPath());
+      }
+    }
 
   // Replace the original source file extension with the object file
   // extension.