[cmake-commits] hoffman committed cmLocalGenerator.cxx 1.215 1.216 cmLocalGenerator.h 1.80 1.81 cmLocalUnixMakefileGenerator3.cxx 1.205 1.206 cmLocalUnixMakefileGenerator3.h 1.69 1.70

[cmake-commits at cmake.org]

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

Modified Files:
	cmLocalGenerator.cxx cmLocalGenerator.h 
	cmLocalUnixMakefileGenerator3.cxx 
	cmLocalUnixMakefileGenerator3.h 
Log Message:
BUG: fix -D escaped quotes for watcom


Index: cmLocalUnixMakefileGenerator3.h
===================================================================
RCS file: /cvsroot/CMake/CMake/Source/cmLocalUnixMakefileGenerator3.h,v
retrieving revision 1.69
retrieving revision 1.70
diff -u -d -r1.69 -r1.70
--- cmLocalUnixMakefileGenerator3.h	8 Mar 2007 19:57:28 -0000	1.69
+++ cmLocalUnixMakefileGenerator3.h	10 May 2007 18:43:55 -0000	1.70
@@ -177,6 +177,9 @@
   /** used to create a recursive make call */
   std::string GetRecursiveMakeCall(const char *makefile, const char* tgt);    
   
+  // append flags to a string
+  virtual void AppendFlags(std::string& flags, const char* newFlags);
+
   // append an echo command
   enum EchoColor { EchoNormal, EchoDepend, EchoBuild, EchoLink,
                    EchoGenerate, EchoGlobal };

Index: cmLocalGenerator.cxx
===================================================================
RCS file: /cvsroot/CMake/CMake/Source/cmLocalGenerator.cxx,v
retrieving revision 1.215
retrieving revision 1.216
diff -u -d -r1.215 -r1.216
--- cmLocalGenerator.cxx	9 May 2007 12:25:45 -0000	1.215
+++ cmLocalGenerator.cxx	10 May 2007 18:43:54 -0000	1.216
@@ -2074,6 +2074,7 @@
 {
   if(newFlags && *newFlags)
     {
+    std::string newf = newFlags;
     if(flags.size())
       {
       flags += " ";

Index: cmLocalGenerator.h
===================================================================
RCS file: /cvsroot/CMake/CMake/Source/cmLocalGenerator.h,v
retrieving revision 1.80
retrieving revision 1.81
diff -u -d -r1.80 -r1.81
--- cmLocalGenerator.h	9 May 2007 18:41:38 -0000	1.80
+++ cmLocalGenerator.h	10 May 2007 18:43:55 -0000	1.81
@@ -131,7 +131,7 @@
   void AddSharedFlags(std::string& flags, const char* lang, bool shared);
   void AddConfigVariableFlags(std::string& flags, const char* var,
                               const char* config);
-  void AppendFlags(std::string& flags, const char* newFlags);
+  virtual void AppendFlags(std::string& flags, const char* newFlags);
   ///! Get the include flags for the current makefile and language
   const char* GetIncludeFlags(const char* lang); 
 

Index: cmLocalUnixMakefileGenerator3.cxx
===================================================================
RCS file: /cvsroot/CMake/CMake/Source/cmLocalUnixMakefileGenerator3.cxx,v
retrieving revision 1.205
retrieving revision 1.206
diff -u -d -r1.205 -r1.206
--- cmLocalUnixMakefileGenerator3.cxx	9 May 2007 12:25:45 -0000	1.205
+++ cmLocalUnixMakefileGenerator3.cxx	10 May 2007 18:43:55 -0000	1.206
@@ -806,6 +806,23 @@
 
 
 //----------------------------------------------------------------------------
+void cmLocalUnixMakefileGenerator3::AppendFlags(std::string& flags,
+                                                const char* newFlags)
+{
+  if(this->WatcomWMake && newFlags && *newFlags)
+    {
+    std::string newf = newFlags;
+    if(newf.find("\\\"") != newf.npos)
+      {
+      cmSystemTools::ReplaceString(newf, "\\\"", "\"");
+      this->cmLocalGenerator::AppendFlags(flags, newf.c_str());
+      return;
+      }
+    }
+  this->cmLocalGenerator::AppendFlags(flags, newFlags);
+}
+
+//----------------------------------------------------------------------------
 void
 cmLocalUnixMakefileGenerator3
 ::AppendRuleDepend(std::vector<std::string>& depends,