[cmake-commits] hoffman committed CMakeLists.txt 1.289.2.6 1.289.2.7 cmOrderLinkDirectories.cxx 1.29.2.2 1.29.2.3

[cmake-commits at cmake.org]

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

Modified Files:
      Tag: CMake-2-4
	CMakeLists.txt cmOrderLinkDirectories.cxx 
Log Message:
ENH: put fix for foo.dll.lib problem on branch with test


Index: cmOrderLinkDirectories.cxx
===================================================================
RCS file: /cvsroot/CMake/CMake/Source/cmOrderLinkDirectories.cxx,v
retrieving revision 1.29.2.2
retrieving revision 1.29.2.3
diff -u -d -r1.29.2.2 -r1.29.2.3
--- cmOrderLinkDirectories.cxx	13 Oct 2006 14:52:06 -0000	1.29.2.2
+++ cmOrderLinkDirectories.cxx	30 Nov 2006 15:12:56 -0000	1.29.2.3
@@ -463,7 +463,11 @@
 #ifdef CM_ORDER_LINK_DIRECTORIES_DEBUG
     fprintf(stderr, "Raw link item [%s]\n", this->RawLinkItems[i].c_str());
 #endif
-    if(cmSystemTools::FileIsFullPath(this->RawLinkItems[i].c_str()))
+    // check to see if the file is a full path or just contains 
+    // a / in it and is a path to something
+    cmStdString& item = this->RawLinkItems[i];
+    if(cmSystemTools::FileIsFullPath(item.c_str())
+       || item.find("/") != item.npos)
       {
       if(cmSystemTools::FileIsDirectory(this->RawLinkItems[i].c_str()))
         {
@@ -486,6 +490,8 @@
           }
         else
           {
+          // A full path to a directory was found as a link item
+          // warn user 
           std::string message = 
             "Warning: Ignoring path found in link libraries for target: ";
           message += this->TargetName;
@@ -496,7 +502,7 @@
           cmSystemTools::Message(message.c_str());
           continue;
           }
-        }
+        } // is it a directory
       if(!framework)
         {
         dir = cmSystemTools::GetFilenamePath(this->RawLinkItems[i]);

Index: CMakeLists.txt
===================================================================
RCS file: /cvsroot/CMake/CMake/Source/CMakeLists.txt,v
retrieving revision 1.289.2.6
retrieving revision 1.289.2.7
diff -u -d -r1.289.2.6 -r1.289.2.7
--- CMakeLists.txt	28 Nov 2006 19:19:44 -0000	1.289.2.6
+++ CMakeLists.txt	30 Nov 2006 15:12:56 -0000	1.289.2.7
@@ -402,6 +402,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}
+    --build-and-test
+    "${CMake_SOURCE_DIR}/Tests/LibName"
+    "${CMake_BINARY_DIR}/Tests/LibName"
+    --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
+    )
 
   ADD_TEST(CustomCommand  ${CMAKE_CTEST_COMMAND}
     --build-and-test