[cmake-commits] king committed cmLocalGenerator.cxx 1.210 1.211

[cmake-commits at cmake.org]

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

Modified Files:
	cmLocalGenerator.cxx 
Log Message:
BUG: Cannot escape link items because some need the spaces to separate arguments.  Instead just escape the argument to the loader flag.


Index: cmLocalGenerator.cxx
===================================================================
RCS file: /cvsroot/CMake/CMake/Source/cmLocalGenerator.cxx,v
retrieving revision 1.210
retrieving revision 1.211
diff -u -d -r1.210 -r1.211
--- cmLocalGenerator.cxx	18 Apr 2007 03:16:35 -0000	1.210
+++ cmLocalGenerator.cxx	18 Apr 2007 04:04:56 -0000	1.211
@@ -1585,7 +1585,7 @@
   for(std::vector<cmStdString>::iterator lib = libNames.begin();
       lib != libNames.end(); ++lib)
     {
-    linkLibs += this->Convert(lib->c_str(), NONE, SHELL, false);
+    linkLibs += *lib;
     linkLibs += " ";
     }
 
@@ -1715,17 +1715,17 @@
         // Pass the full path to the target file but purposely leave
         // off the per-configuration subdirectory.  The link directory
         // ordering knows how to deal with this.
-        std::string linkItem;
+        std::string linkItem = tgt->GetDirectory(0, implib);
+        linkItem += "/";
+        linkItem += tgt->GetFullName(config, implib);
         if(impexe && loader_flag)
           {
           // This link item is an executable that may provide symbols
           // used by this target.  A special flag is needed on this
           // platform.  Add it now.
-          linkItem += loader_flag;
+          linkItem = loader_flag +
+            this->Convert(linkItem.c_str(), NONE, SHELL, false);
           }
-        linkItem += tgt->GetDirectory(0, implib);
-        linkItem += "/";
-        linkItem += tgt->GetFullName(config, implib);
         linkLibraries.push_back(linkItem);
         // For full path, use the true location.
         if(fullPathLibs)