[cmake-commits] king committed cmGlobalNMakeMakefileGenerator.cxx 1.25 1.26 cmLocalGenerator.cxx 1.248 1.249 cmLocalGenerator.h 1.93 1.94 cmLocalUnixMakefileGenerator3.h 1.81 1.82 cmLocalVisualStudio7Generator.cxx 1.209 1.210

[cmake-commits at cmake.org]

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

Modified Files:
	cmGlobalNMakeMakefileGenerator.cxx cmLocalGenerator.cxx 
	cmLocalGenerator.h cmLocalUnixMakefileGenerator3.h 
	cmLocalVisualStudio7Generator.cxx 
Log Message:
ENH: Improved escaping in kwsys/System.  Added escape of % for NMake.  Added escape of ; for the VS IDE.


Index: cmLocalUnixMakefileGenerator3.h
===================================================================
RCS file: /cvsroot/CMake/CMake/Source/cmLocalUnixMakefileGenerator3.h,v
retrieving revision 1.81
retrieving revision 1.82
diff -u -d -r1.81 -r1.82
--- cmLocalUnixMakefileGenerator3.h	7 Jan 2008 21:12:37 -0000	1.81
+++ cmLocalUnixMakefileGenerator3.h	13 Jan 2008 21:36:20 -0000	1.82
@@ -102,6 +102,11 @@
   void SetMinGWMake(bool v)  {this->MinGWMake = v;}
 
   /**
+   * Set to true if the make tool being used is NMake.
+   */
+  void SetNMake(bool v)  {this->NMake = v;}
+
+  /**
    * Set to true if the shell being used is the MSYS shell.
    * This controls if statements in the makefile and the SHELL variable.
    * The default is false.

Index: cmLocalVisualStudio7Generator.cxx
===================================================================
RCS file: /cvsroot/CMake/CMake/Source/cmLocalVisualStudio7Generator.cxx,v
retrieving revision 1.209
retrieving revision 1.210
diff -u -d -r1.209 -r1.210
--- cmLocalVisualStudio7Generator.cxx	18 Dec 2007 14:50:08 -0000	1.209
+++ cmLocalVisualStudio7Generator.cxx	13 Jan 2008 21:36:20 -0000	1.210
@@ -76,7 +76,8 @@
       {
       std::vector<std::string> no_depends;
       cmCustomCommandLine force_command;
-      force_command.push_back(";");
+      force_command.push_back("cd");
+      force_command.push_back(".");
       cmCustomCommandLines force_commands;
       force_commands.push_back(force_command);
       const char* no_main_dependency = 0;

Index: cmGlobalNMakeMakefileGenerator.cxx
===================================================================
RCS file: /cvsroot/CMake/CMake/Source/cmGlobalNMakeMakefileGenerator.cxx,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -d -r1.25 -r1.26
--- cmGlobalNMakeMakefileGenerator.cxx	22 Oct 2007 16:48:39 -0000	1.25
+++ cmGlobalNMakeMakefileGenerator.cxx	13 Jan 2008 21:36:20 -0000	1.26
@@ -47,6 +47,7 @@
   lg->SetGlobalGenerator(this);
   lg->SetIgnoreLibPrefix(true);
   lg->SetPassMakeflags(true);
+  lg->SetNMake(true);
   lg->SetUnixCD(false);
   return lg;
 }

Index: cmLocalGenerator.h
===================================================================
RCS file: /cvsroot/CMake/CMake/Source/cmLocalGenerator.h,v
retrieving revision 1.93
retrieving revision 1.94
diff -u -d -r1.93 -r1.94
--- cmLocalGenerator.h	11 Jan 2008 18:00:29 -0000	1.93
+++ cmLocalGenerator.h	13 Jan 2008 21:36:20 -0000	1.94
@@ -341,6 +341,7 @@
   bool WindowsVSIDE;
   bool WatcomWMake;
   bool MinGWMake;
+  bool NMake;
   bool ForceUnixPath;
   bool MSYSShell;
   bool UseRelativePaths;

Index: cmLocalGenerator.cxx
===================================================================
RCS file: /cvsroot/CMake/CMake/Source/cmLocalGenerator.cxx,v
retrieving revision 1.248
retrieving revision 1.249
diff -u -d -r1.248 -r1.249
--- cmLocalGenerator.cxx	11 Jan 2008 18:00:29 -0000	1.248
+++ cmLocalGenerator.cxx	13 Jan 2008 21:36:20 -0000	1.249
@@ -48,6 +48,7 @@
   this->WindowsVSIDE = false;
   this->WatcomWMake = false;
   this->MinGWMake = false;
+  this->NMake = false;
   this->MSYSShell = false;
   this->IgnoreLibPrefix = false;
   this->UseRelativePaths = false;
@@ -2884,6 +2885,10 @@
     {
     flags |= cmsysSystem_Shell_Flag_MinGWMake;
     }
+  if(this->NMake)
+    {
+    flags |= cmsysSystem_Shell_Flag_NMake;
+    }
 
   // Compute the buffer size needed.
   int size = (this->WindowsShell ?