[Cmake-commits] [cmake-commits] king committed cmLocalUnixMakefileGenerator3.cxx 1.246 1.247

[cmake-commits at cmake.org]

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

Modified Files:
	cmLocalUnixMakefileGenerator3.cxx 
Log Message:
BUG: For Watcom WMake use the short path to avoid quoting problems in custom commands with shell redirections.


Index: cmLocalUnixMakefileGenerator3.cxx
===================================================================
RCS file: /cvsroot/CMake/CMake/Source/cmLocalUnixMakefileGenerator3.cxx,v
retrieving revision 1.246
retrieving revision 1.247
diff -C 2 -d -r1.246 -r1.247
*** cmLocalUnixMakefileGenerator3.cxx	10 Apr 2008 15:55:49 -0000	1.246
--- cmLocalUnixMakefileGenerator3.cxx	30 Apr 2008 19:58:56 -0000	1.247
***************
*** 1020,1023 ****
--- 1020,1036 ----
          cmd = "./" + cmd;
          }
+       if(this->WatcomWMake &&
+          cmSystemTools::FileIsFullPath(cmd.c_str()) &&
+          cmd.find(" ") != cmd.npos)
+         {
+         // On Watcom WMake use the windows short path for the command
+         // name.  This is needed to avoid funny quoting problems on
+         // lines with shell redirection operators.
+         std::string scmd;
+         if(cmSystemTools::GetShortPath(cmd.c_str(), scmd))
+           {
+           cmd = scmd;
+           }
+         }
        cmd = this->Convert(cmd.c_str(),NONE,SHELL);
        for(unsigned int j=1; j < commandLine.size(); ++j)