ERR: Change to EscapeSpaces forces rework of Borland generator <sigh>

Add clause to prevent adding quotes when they're already present, then stuff them
onto all lib paths to prevent forward slashes causing trouble.

1 files changed, 10 insertions, 2 deletions

diff --git a/Source/cmSystemTools.cxx b/Source/cmSystemTools.cxx
index 795208d..fb2f297 100644
--- a/Source/cmSystemTools.cxx
+++ b/Source/cmSystemTools.cxx
@@ -345,9 +345,17 @@ std::string cmSystemTools::EscapeSpaces(const char* str)
   std::string temp = str;
   if (temp.find(" ") != std::string::npos)
     {
-    result = "\"";
+    // don't add quotes if they're already there
+    if (temp.find("\"")==std::string::npos)
+      {
+      result = "\"";
+      }
     result += cmSystemTools::HandleNetworkPaths(str);
-    return result+"\"";
+    if (temp.find("\"")==std::string::npos)
+      {
+      result += "\"";
+      }
+    return result;
     }
   return cmSystemTools::HandleNetworkPaths(str);