Bläddra i källkod

BUG: fix for bug 346, borland should now support dash in the path

Bill Hoffman 22 år sedan
förälder
incheckning
34853be45a

+ 1 - 1
Modules/Platform/Windows-bcc32.cmake

@@ -41,7 +41,7 @@ SET(CMAKE_C_CREATE_SHARED_MODULE ${CMAKE_C_CREATE_SHARED_LIBRARY})
 
 
 # create a C++ static library
-SET(CMAKE_CXX_CREATE_STATIC_LIBRARY  "tlib ${CMAKE_START_TEMP_FILE}/p512 <LINK_FLAGS> /a <TARGET> <OBJECTS_QUOTED>${CMAKE_END_TEMP_FILE}")
+SET(CMAKE_CXX_CREATE_STATIC_LIBRARY  "tlib ${CMAKE_START_TEMP_FILE}/p512 <LINK_FLAGS> /a <TARGET_QUOTED> <OBJECTS_QUOTED>${CMAKE_END_TEMP_FILE}")
 
 # create a C static library
 SET(CMAKE_C_CREATE_STATIC_LIBRARY ${CMAKE_CXX_CREATE_STATIC_LIBRARY})

+ 0 - 7
Source/cmGlobalBorlandMakefileGenerator.cxx

@@ -35,13 +35,6 @@ void cmGlobalBorlandMakefileGenerator::EnableLanguage(const char* l,
     return;
     }
   std::string outdir = m_CMakeInstance->GetStartOutputDirectory();
-  if(outdir.find('-') != std::string::npos)
-    {
-    std::string message = "The Borland command line tools do not support path names that have - in them.  Please re-name your output directory and use _ instead of -.";
-    message += "\nYour path currently is: ";
-    message += outdir;
-    cmSystemTools::Error(message.c_str());
-    }
   mf->AddDefinition("BORLAND", "1");
   mf->AddDefinition("CMAKE_GENERATOR_CC", "bcc32");
   mf->AddDefinition("CMAKE_GENERATOR_CXX", "bcc32"); 

+ 9 - 1
Source/cmLocalUnixMakefileGenerator.cxx

@@ -928,7 +928,15 @@ cmLocalUnixMakefileGenerator::ExpandRuleVariables(std::string& s,
     cmSystemTools::ReplaceString(s, "<OBJECTS_QUOTED>", objectsquoted);
     }
   if(target)
-    {
+    { 
+    std::string targetQuoted = target;
+    if(targetQuoted.size() && targetQuoted[0] != '\"')
+      {
+      targetQuoted = '\"';
+      targetQuoted += target;
+      targetQuoted += '\"';
+      }
+    cmSystemTools::ReplaceString(s, "<TARGET_QUOTED>", targetQuoted.c_str());
     cmSystemTools::ReplaceString(s, "<TARGET>", target);
     }
   if(targetBase)