[cmake-commits] hoffman committed CMakeLists.txt 1.315 1.316 cmLocalGenerator.cxx 1.166 1.167 cmTarget.cxx 1.114 1.115

[cmake-commits at cmake.org]

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

Modified Files:
	CMakeLists.txt cmLocalGenerator.cxx cmTarget.cxx 
Log Message:
ENH: fix bug in full path to target depends stuff


Index: cmLocalGenerator.cxx
===================================================================
RCS file: /cvsroot/CMake/CMake/Source/cmLocalGenerator.cxx,v
retrieving revision 1.166
retrieving revision 1.167
diff -u -d -r1.166 -r1.167
--- cmLocalGenerator.cxx	4 Dec 2006 18:54:32 -0000	1.166
+++ cmLocalGenerator.cxx	7 Dec 2006 04:05:10 -0000	1.167
@@ -1863,6 +1863,8 @@
       tLocation = cmSystemTools::GetFilenamePath(tLocation);
       std::string depLocation = cmSystemTools::GetFilenamePath(
         std::string(inName));
+      depLocation = cmSystemTools::CollapseFullPath(depLocation.c_str());
+      tLocation = cmSystemTools::CollapseFullPath(tLocation.c_str());
       if(depLocation != tLocation)
         {
         // it is a full path to a depend that has the same name

Index: CMakeLists.txt
===================================================================
RCS file: /cvsroot/CMake/CMake/Source/CMakeLists.txt,v
retrieving revision 1.315
retrieving revision 1.316
diff -u -d -r1.315 -r1.316
--- CMakeLists.txt	4 Dec 2006 16:19:59 -0000	1.315
+++ CMakeLists.txt	7 Dec 2006 04:05:10 -0000	1.316
@@ -410,16 +410,17 @@
     --test-command ${CMAKE_CMAKE_COMMAND} -E compare_files 
     ${CMake_SOURCE_DIR}/Tests/TargetName/scripts/hello_world
     ${CMake_BINARY_DIR}/Tests/TargetName/scripts/hello_world)
-  ADD_TEST(LibName ${CMAKE_CTEST_COMMAND}
+
+  ADD_TEST(CustComDepend ${CMAKE_CTEST_COMMAND}
     --build-and-test
-    "${CMake_SOURCE_DIR}/Tests/LibName"
-    "${CMake_BINARY_DIR}/Tests/LibName"
+    "${CMake_SOURCE_DIR}/Tests/CustComDepend"
+    "${CMake_BINARY_DIR}/Tests/CustComDepend"
     --build-two-config
     --build-generator ${CMAKE_TEST_GENERATOR}
     --build-makeprogram ${CMAKE_TEST_MAKEPROGRAM}
-    --build-project LibName 
-    --build-exe-dir "${CMake_BINARY_DIR}/Tests/LibName/lib"
-    --test-command foobar
+    --build-project CustComDepend 
+    --build-exe-dir "${CMake_BINARY_DIR}/Tests/CustComDepend/bin"
+    --test-command foo bar.c
     )
 
   ADD_TEST(CustomCommand  ${CMAKE_CTEST_COMMAND}

Index: cmTarget.cxx
===================================================================
RCS file: /cvsroot/CMake/CMake/Source/cmTarget.cxx,v
retrieving revision 1.114
retrieving revision 1.115
diff -u -d -r1.114 -r1.115
--- cmTarget.cxx	30 Nov 2006 22:32:46 -0000	1.114
+++ cmTarget.cxx	7 Dec 2006 04:05:10 -0000	1.115
@@ -253,6 +253,8 @@
             tLocation = cmSystemTools::GetFilenamePath(tLocation);
             std::string depLocation = cmSystemTools::GetFilenamePath(
               std::string(fullName));
+            depLocation = cmSystemTools::CollapseFullPath(depLocation.c_str());
+            tLocation = cmSystemTools::CollapseFullPath(tLocation.c_str());
             if(depLocation == tLocation)
               {
               isUtility = true;