[cmake-commits] king committed cmGlobalXCodeGenerator.cxx 1.120 1.121 cmLocalGenerator.h 1.63 1.64

[cmake-commits at cmake.org]

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

Modified Files:
	cmGlobalXCodeGenerator.cxx cmLocalGenerator.h 
Log Message:
BUG: Enabled use of EscapeForShell to properly escape custom command lines.  This addresses bug#3786 for Xcode.


Index: cmGlobalXCodeGenerator.cxx
===================================================================
RCS file: /cvsroot/CMake/CMake/Source/cmGlobalXCodeGenerator.cxx,v
retrieving revision 1.120
retrieving revision 1.121
diff -u -d -r1.120 -r1.121
--- cmGlobalXCodeGenerator.cxx	14 Aug 2006 21:02:34 -0000	1.120
+++ cmGlobalXCodeGenerator.cxx	21 Sep 2006 20:10:47 -0000	1.121
@@ -1037,7 +1037,8 @@
         for(unsigned int j=1; j < commandLine.size(); ++j)
           {
           cmd += " ";
-          cmd += cmSystemTools::EscapeSpaces(commandLine[j].c_str());
+          cmd += (this->CurrentLocalGenerator
+                  ->EscapeForShell(commandLine[j].c_str()));
           }
         makefileStream << "\t" << cmd.c_str() << "\n";
         }

Index: cmLocalGenerator.h
===================================================================
RCS file: /cvsroot/CMake/CMake/Source/cmLocalGenerator.h,v
retrieving revision 1.63
retrieving revision 1.64
diff -u -d -r1.63 -r1.64
--- cmLocalGenerator.h	21 Sep 2006 19:14:06 -0000	1.63
+++ cmLocalGenerator.h	21 Sep 2006 20:10:47 -0000	1.64
@@ -201,12 +201,12 @@
     const char* LanguageCompileFlags;
   };
 
-protected:
-
   /** Escape the given string to be used as a command line argument in
       the native build system shell.  */
   std::string EscapeForShell(const char* str);
 
+protected:
+
   /** Construct a comment for a custom command.  */
   std::string ConstructComment(const cmCustomCommand& cc,
                                const char* default_comment = "");