Index: Source/cmLocalVisualStudio7Generator.cxx
===================================================================
RCS file: /cvsroot/CMake/CMake/Source/cmLocalVisualStudio7Generator.cxx,v
retrieving revision 1.234
diff -u -r1.234 cmLocalVisualStudio7Generator.cxx
--- Source/cmLocalVisualStudio7Generator.cxx	27 Oct 2008 19:31:03 -0000	1.234
+++ Source/cmLocalVisualStudio7Generator.cxx	2 Dec 2008 16:04:05 -0000
@@ -32,6 +32,7 @@
 #include <ctype.h> // for isspace
 
 static bool cmLVS6G_IsFAT(const char* dir);
+std::string cmLocalVisualStudio7GeneratorEscapeForXML(const char* s);
 
 class cmLocalVisualStudio7GeneratorInternals
 {
@@ -645,17 +646,19 @@
   targetOptions.SetVerboseMakefile(
     this->Makefile->IsOn("CMAKE_VERBOSE_MAKEFILE"));
 
+  // Add the export symbol definition for shared library objects.
+  if(const char* exportMacro = target.GetExportMacro())
+    {
+    targetOptions.AddDefine(exportMacro);
+    }
+
   // Add a definition for the configuration name.
   std::string configDefine = "CMAKE_INTDIR=\"";
   configDefine += configName;
   configDefine += "\"";
+  Options targetOptionsExclIntDir = targetOptions;
   targetOptions.AddDefine(configDefine);
 
-  // Add the export symbol definition for shared library objects.
-  if(const char* exportMacro = target.GetExportMacro())
-    {
-    targetOptions.AddDefine(exportMacro);
-    }
 
   // The intermediate directory name consists of a directory for the
   // target and a subdirectory for the configuration name.
@@ -770,7 +773,11 @@
     tool = "VFMIDLTool";
     }
   fout << "\t\t\t<Tool\n\t\t\t\tName=\"" << tool << "\"\n";
-  targetOptions.OutputPreprocessorDefinitions(fout, "\t\t\t\t", "\n");
+  // workaround for bug in VS2005 midl which chokes on the quoted defines handed from the ide
+  targetOptionsExclIntDir.OutputPreprocessorDefinitions(fout, "\t\t\t\t", "\n");
+  std::string configDefineEsc = this->EscapeForShell(configDefine.c_str(), true);
+  configDefineEsc = cmLocalVisualStudio7GeneratorEscapeForXML(configDefineEsc.c_str());
+  fout << "\t\t\t\tAdditionalOptions=\"/D" + configDefineEsc + "\"\n";
   fout << "\t\t\t\tMkTypLibCompatible=\"FALSE\"\n";
   if( this->PlatformName == "x64" )
     {

Index: cmLocalVisualStudio7Generator.cxx
===================================================================
--- cmLocalVisualStudio7Generator.cxx	(revision 256)
+++ cmLocalVisualStudio7Generator.cxx	(working copy)
@@ -776,7 +776,7 @@
     tool = "VFMIDLTool";
     }
   fout << "\t\t\t<Tool\n\t\t\t\tName=\"" << tool << "\"\n";
-  targetOptions.OutputPreprocessorDefinitions(fout, "\t\t\t\t", "\n");
+  targetOptions.OutputPreprocessorDefinitions(fout, "\t\t\t\t", "\n", true);
   fout << "\t\t\t\tMkTypLibCompatible=\"FALSE\"\n";
   if( this->PlatformName == "x64" )
     {
Index: cmVisualStudioGeneratorOptions.cxx
===================================================================
--- cmVisualStudioGeneratorOptions.cxx	(revision 256)
+++ cmVisualStudioGeneratorOptions.cxx	(working copy)
@@ -155,7 +155,8 @@
 cmVisualStudioGeneratorOptions
 ::OutputPreprocessorDefinitions(std::ostream& fout,
                                 const char* prefix,
-                                const char* suffix)
+                                const char* suffix,
+                                bool filterDoubleQuotes )
 {
   if(this->Defines.empty())
     {
@@ -191,9 +192,25 @@
     std::string define;
     if(this->Version != 10)
       {
+		std::string def = *di;
+
+		// 
+		if ( filterDoubleQuotes )
+		{
+			size_t pos;
+			while ( (pos=def.find( "\\\"" )) != def.npos )
+			{
+				def = def.replace( pos, 2, "" );
+			}
+			while ( (pos=def.find( "\"" )) != def.npos )
+			{
+				def = def.replace( pos, 1, "" );
+			}
+		}
+
       define =
-        this->LocalGenerator->EscapeForShell(di->c_str(), true);
-      }
+        this->LocalGenerator->EscapeForShell(def.c_str(), true);
+	  }
     else
       {
       define = *di;
Index: cmVisualStudioGeneratorOptions.h
===================================================================
--- cmVisualStudioGeneratorOptions.h	(revision 256)
+++ cmVisualStudioGeneratorOptions.h	(working copy)
@@ -53,7 +53,8 @@
   // Write options to output.
   void OutputPreprocessorDefinitions(std::ostream& fout,
                                      const char* prefix,
-                                     const char* suffix);
+                                     const char* suffix,
+                                     bool filterDoubleQuotes=false );
   void OutputFlagMap(std::ostream& fout, const char* indent);
   void OutputAdditionalOptions(std::ostream& fout,
                                const char* prefix,

Index: cmLocalVisualStudio7Generator.cxx
===================================================================
RCS file: /cvsroot/CMake/CMake/Source/cmLocalVisualStudio7Generator.cxx,v
retrieving revision 1.252.2.2
diff -u -r1.252.2.2 cmLocalVisualStudio7Generator.cxx
--- cmLocalVisualStudio7Generator.cxx	28 Oct 2009 16:15:19 -0000	1.252.2.2
+++ cmLocalVisualStudio7Generator.cxx	29 Jan 2010 10:28:24 -0000
@@ -654,11 +654,6 @@
   targetOptions.SetVerboseMakefile(
     this->Makefile->IsOn("CMAKE_VERBOSE_MAKEFILE"));
 
-  // Add a definition for the configuration name.
-  std::string configDefine = "CMAKE_INTDIR=\"";
-  configDefine += configName;
-  configDefine += "\"";
-  targetOptions.AddDefine(configDefine);
 
   // Add the export symbol definition for shared library objects.
   if(const char* exportMacro = target.GetExportMacro())
@@ -666,6 +661,15 @@
     targetOptions.AddDefine(exportMacro);
     }
 
+  // only needed for midl 
+  Options targetOptionsExclIntDir = targetOptions;
+
+  // Add a definition for the configuration name.
+  std::string configDefine = "CMAKE_INTDIR=\"";
+  configDefine += configName;
+  configDefine += "\"";
+  targetOptions.AddDefine(configDefine);
+
   // The intermediate directory name consists of a directory for the
   // target and a subdirectory for the configuration name.
   std::string intermediateDir = this->GetTargetDirectory(target);
@@ -776,7 +780,13 @@
     tool = "VFMIDLTool";
     }
   fout << "\t\t\t<Tool\n\t\t\t\tName=\"" << tool << "\"\n";
-  targetOptions.OutputPreprocessorDefinitions(fout, "\t\t\t\t", "\n");
+
+  // workaround for bug in midl which chokes on the quoted defines handed from the ide
+  targetOptionsExclIntDir.OutputPreprocessorDefinitions(fout, "\t\t\t\t", "\n");
+  std::string configDefineEsc = this->EscapeForShell(configDefine.c_str(), true);
+  configDefineEsc = this->EscapeForXML(configDefineEsc.c_str());
+  fout << "\t\t\t\tAdditionalOptions=\"/D" + configDefineEsc + "\"\n";
+
   fout << "\t\t\t\tMkTypLibCompatible=\"FALSE\"\n";
   if( this->PlatformName == "x64" )
     {

--- Source/cmLocalVisualStudio7Generator.cxx	Fri Nov 12 21:54:10 2010
+++ Source/cmLocalVisualStudio7Generator.cxx	Sat Nov 13 07:34:59 2010
@@ -801,7 +801,6 @@
     tool = "VFMIDLTool";
     }
   fout << "\t\t\t<Tool\n\t\t\t\tName=\"" << tool << "\"\n";
-  targetOptions.OutputPreprocessorDefinitions(fout, "\t\t\t\t", "\n");
   fout << "\t\t\t\tMkTypLibCompatible=\"FALSE\"\n";
   if( this->PlatformName == "x64" )
     {