Index: Source/cmLocalVisualStudio6Generator.cxx
===================================================================
RCS file: /cvsroot/CMake/CMake/Source/cmLocalVisualStudio6Generator.cxx,v
retrieving revision 1.144
diff -u -r1.144 cmLocalVisualStudio6Generator.cxx
--- Source/cmLocalVisualStudio6Generator.cxx	9 Sep 2008 17:04:30 -0000	1.144
+++ Source/cmLocalVisualStudio6Generator.cxx	2 Dec 2008 14:44:59 -0000
@@ -1511,31 +1511,29 @@
       }
 
     // Add per-target and per-configuration preprocessor definitions.
-    this->AppendDefines
-      (flags, this->Makefile->GetProperty("COMPILE_DEFINITIONS"), 0);
-    this->AppendDefines(flags, target.GetProperty("COMPILE_DEFINITIONS"), 0);
-    this->AppendDefines
-      (flagsDebug,
-       this->Makefile->GetProperty("COMPILE_DEFINITIONS_DEBUG"), 0);
-    this->AppendDefines(flagsDebug,
-                        target.GetProperty("COMPILE_DEFINITIONS_DEBUG"), 0);
-    this->AppendDefines
-      (flagsRelease,
-       this->Makefile->GetProperty("COMPILE_DEFINITIONS_RELEASE"), 0);
-    this->AppendDefines(flagsRelease,
-                        target.GetProperty("COMPILE_DEFINITIONS_RELEASE"), 0);
-    this->AppendDefines
-      (flagsMinSize,
-       this->Makefile->GetProperty("COMPILE_DEFINITIONS_MINSIZEREL"), 0);
-    this->AppendDefines
-      (flagsMinSize,
-       target.GetProperty("COMPILE_DEFINITIONS_MINSIZEREL"), 0);
-    this->AppendDefines
-      (flagsDebugRel,
-       this->Makefile->GetProperty("COMPILE_DEFINITIONS_RELWITHDEBINFO"), 0);
-    this->AppendDefines
-      (flagsDebugRel,
-       target.GetProperty("COMPILE_DEFINITIONS_RELWITHDEBINFO"), 0);
+    std::string defines = " ";
+    std::string debugDefines = " ";
+    std::string releaseDefines = " ";
+    std::string minsizeDefines = " ";
+    std::string debugrelDefines = " ";
+
+    this->AppendDefines(defines,this->Makefile->GetProperty("COMPILE_DEFINITIONS"), 0);
+    this->AppendDefines(debugDefines,this->Makefile->GetProperty("COMPILE_DEFINITIONS_DEBUG"), 0);
+    this->AppendDefines(releaseDefines,this->Makefile->GetProperty("COMPILE_DEFINITIONS_RELEASE"), 0);
+    this->AppendDefines(minsizeDefines,this->Makefile->GetProperty("COMPILE_DEFINITIONS_MINSIZEREL"), 0);
+    this->AppendDefines(debugrelDefines,this->Makefile->GetProperty("COMPILE_DEFINITIONS_RELWITHDEBINFO"), 0);
+
+    this->AppendDefines(defines,target.GetProperty("COMPILE_DEFINITIONS"), 0);
+    this->AppendDefines(debugDefines,target.GetProperty("COMPILE_DEFINITIONS_DEBUG"), 0);
+    this->AppendDefines(releaseDefines,target.GetProperty("COMPILE_DEFINITIONS_RELEASE"), 0);
+    this->AppendDefines(minsizeDefines,target.GetProperty("COMPILE_DEFINITIONS_MINSIZEREL"), 0);
+    this->AppendDefines(debugrelDefines,target.GetProperty("COMPILE_DEFINITIONS_RELWITHDEBINFO"), 0);
+
+    this->AppendDefines(flags, defines.c_str(), 0);
+    this->AppendDefines(flagsDebug, debugDefines.c_str(), 0);
+    this->AppendDefines(flagsRelease, releaseDefines.c_str(), 0);
+    this->AppendDefines(flagsMinSize, minsizeDefines.c_str(), 0);
+    this->AppendDefines(flagsDebugRel, debugrelDefines.c_str(), 0);
 
     // The template files have CXX FLAGS in them, that need to be replaced.
     // There are not separate CXX and C template files, so we use the same
@@ -1550,6 +1548,17 @@
     cmSystemTools::ReplaceString(line, "CMAKE_CXX_FLAGS_RELEASE", 
                                  flagsRelease.c_str());
     cmSystemTools::ReplaceString(line, "CMAKE_CXX_FLAGS", flags.c_str());
+
+    cmSystemTools::ReplaceString(line, "COMPILE_DEFINITIONS_MINSIZE", 
+                                 minsizeDefines.c_str());
+    cmSystemTools::ReplaceString(line, "COMPILE_DEFINITIONS_DEBUG", 
+                                 debugDefines.c_str());
+    cmSystemTools::ReplaceString(line, "COMPILE_DEFINITIONS_RELWITHDEBINFO", 
+                                 debugrelDefines.c_str());
+    cmSystemTools::ReplaceString(line, "COMPILE_DEFINITIONS_RELEASE", 
+                                 releaseDefines.c_str());
+    cmSystemTools::ReplaceString(line, "COMPILE_DEFINITIONS", defines.c_str());
+
     fout << line.c_str() << std::endl;
     }
 }

Index: Templates/staticLibHeader.dsptemplate
===================================================================
RCS file: /cvsroot/CMake/CMake/Templates/staticLibHeader.dsptemplate,v
retrieving revision 1.21
diff -u -r1.21 staticLibHeader.dsptemplate
--- Templates/staticLibHeader.dsptemplate	9 May 2007 12:25:45 -0000	1.21
+++ Templates/staticLibHeader.dsptemplate	2 Dec 2008 14:30:54 -0000
@@ -60,6 +60,8 @@
 # ADD CPP CMAKE_CXX_FLAGS_RELEASE
 # ADD BASE RSC /l 0x409 /d "NDEBUG"
 # ADD RSC BUILD_INCLUDES /l 0x409 /d "NDEBUG"
+# ADD RSC COMPILE_DEFINITIONS
+# ADD RSC COMPILE_DEFINITIONS_RELEASE
 BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo
@@ -88,6 +90,8 @@
 # ADD CPP CMAKE_CXX_FLAGS_DEBUG
 # ADD BASE RSC /l 0x409 /d "_DEBUG"
 # ADD RSC BUILD_INCLUDES /l 0x409 /d "_DEBUG"
+# ADD RSC COMPILE_DEFINITIONS
+# ADD RSC COMPILE_DEFINITIONS_DEBUG
 BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo
@@ -117,6 +121,8 @@
 # ADD CPP CMAKE_CXX_FLAGS_MINSIZEREL
 # ADD BASE RSC /l 0x409 /d "NDEBUG"
 # ADD RSC BUILD_INCLUDES /l 0x409 /d "NDEBUG"
+# ADD RSC COMPILE_DEFINITIONS
+# ADD RSC COMPILE_DEFINITIONS_MINSIZEREL
 BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo
@@ -145,6 +151,8 @@
 # ADD CPP CMAKE_CXX_FLAGS_RELWITHDEBINFO
 # ADD BASE RSC /l 0x409 /d "NDEBUG"
 # ADD RSC BUILD_INCLUDES /l 0x409 /d "NDEBUG"
+# ADD RSC COMPILE_DEFINITIONS
+# ADD RSC COMPILE_DEFINITIONS_RELWITHDEBINFO
 BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo
Index: Templates/DLLHeader.dsptemplate
===================================================================
RCS file: /cvsroot/CMake/CMake/Templates/DLLHeader.dsptemplate,v
retrieving revision 1.29
diff -u -r1.29 DLLHeader.dsptemplate
--- Templates/DLLHeader.dsptemplate	10 Sep 2008 14:36:45 -0000	1.29
+++ Templates/DLLHeader.dsptemplate	2 Dec 2008 14:31:17 -0000
@@ -66,6 +66,8 @@
 # ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32
 # ADD BASE RSC /l 0x409 /d "NDEBUG"
 # ADD RSC BUILD_INCLUDES /l 0x409 /d "NDEBUG"
+# ADD RSC COMPILE_DEFINITIONS
+# ADD RSC COMPILE_DEFINITIONS_RELEASE
 BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo
@@ -98,6 +100,8 @@
 # ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32
 # ADD BASE RSC /l 0x409 /d "_DEBUG"
 # ADD RSC BUILD_INCLUDES /l 0x409 /d "_DEBUG"
+# ADD RSC COMPILE_DEFINITIONS
+# ADD RSC COMPILE_DEFINITIONS_DEBUG
 BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo
@@ -132,6 +136,8 @@
 # ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32
 # ADD BASE RSC /l 0x409 /d "NDEBUG"
 # ADD RSC BUILD_INCLUDES /l 0x409 /d "NDEBUG"
+# ADD RSC COMPILE_DEFINITIONS
+# ADD RSC COMPILE_DEFINITIONS_MINSIZEREL
 BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo
@@ -164,6 +170,8 @@
 # ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32
 # ADD BASE RSC /l 0x409 /d "NDEBUG"
 # ADD RSC BUILD_INCLUDES /l 0x409 /d "NDEBUG"
+# ADD RSC COMPILE_DEFINITIONS
+# ADD RSC COMPILE_DEFINITIONS_RELWITHDEBINFO
 BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo
Index: Templates/EXEHeader.dsptemplate
===================================================================
RCS file: /cvsroot/CMake/CMake/Templates/EXEHeader.dsptemplate,v
retrieving revision 1.24
diff -u -r1.24 EXEHeader.dsptemplate
--- Templates/EXEHeader.dsptemplate	9 Sep 2008 17:04:30 -0000	1.24
+++ Templates/EXEHeader.dsptemplate	2 Dec 2008 14:31:54 -0000
@@ -63,6 +63,8 @@
 # ADD CPP CMAKE_CXX_FLAGS_RELEASE
 # ADD BASE RSC /l 0x409 /d "NDEBUG"
 # ADD RSC BUILD_INCLUDES /l 0x409 /d "NDEBUG"
+# ADD RSC COMPILE_DEFINITIONS
+# ADD RSC COMPILE_DEFINITIONS_RELEASE
 BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo
@@ -95,6 +97,8 @@
 # ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32
 # ADD BASE RSC /l 0x409 /d "_DEBUG"
 # ADD RSC BUILD_INCLUDES /l 0x409 /d "_DEBUG"
+# ADD RSC COMPILE_DEFINITIONS
+# ADD RSC COMPILE_DEFINITIONS_DEBUG
 BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo
@@ -124,6 +128,8 @@
 # ADD CPP CMAKE_CXX_FLAGS_MINSIZEREL
 # ADD BASE RSC /l 0x409 /d "NDEBUG"
 # ADD RSC BUILD_INCLUDES /l 0x409 /d "NDEBUG"
+# ADD RSC COMPILE_DEFINITIONS
+# ADD RSC COMPILE_DEFINITIONS_MINSIZEREL
 BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo
@@ -154,6 +160,8 @@
 # ADD CPP CMAKE_CXX_FLAGS_RELWITHDEBINFO
 # ADD BASE RSC /l 0x409 /d "NDEBUG"
 # ADD RSC BUILD_INCLUDES /l 0x409 /d "NDEBUG"
+# ADD RSC COMPILE_DEFINITIONS
+# ADD RSC COMPILE_DEFINITIONS_RELWITHDEBINFO
 BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo
Index: Templates/EXEWinHeader.dsptemplate
===================================================================
RCS file: /cvsroot/CMake/CMake/Templates/EXEWinHeader.dsptemplate,v
retrieving revision 1.23
diff -u -r1.23 EXEWinHeader.dsptemplate
--- Templates/EXEWinHeader.dsptemplate	10 Sep 2008 14:10:25 -0000	1.23
+++ Templates/EXEWinHeader.dsptemplate	2 Dec 2008 14:31:29 -0000
@@ -65,6 +65,8 @@
 # ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32
 # ADD BASE RSC /l 0x409 /d "NDEBUG"
 # ADD RSC BUILD_INCLUDES /l 0x409 /d "NDEBUG"
+# ADD RSC COMPILE_DEFINITIONS
+# ADD RSC COMPILE_DEFINITIONS_RELEASE
 BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo
@@ -97,6 +99,8 @@
 # ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32
 # ADD BASE RSC /l 0x409 /d "_DEBUG"
 # ADD RSC BUILD_INCLUDES /l 0x409 /d "_DEBUG"
+# ADD RSC COMPILE_DEFINITIONS
+# ADD RSC COMPILE_DEFINITIONS_DEBUG
 BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo
@@ -126,6 +130,8 @@
 # ADD CPP CMAKE_CXX_FLAGS_MINSIZEREL
 # ADD BASE RSC /l 0x409 /d "NDEBUG"
 # ADD RSC BUILD_INCLUDES /l 0x409 /d "NDEBUG"
+# ADD RSC COMPILE_DEFINITIONS
+# ADD RSC COMPILE_DEFINITIONS_MINSIZEREL
 BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo
@@ -158,6 +164,8 @@
 # ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32
 # ADD BASE RSC /l 0x409 /d "NDEBUG"
 # ADD RSC BUILD_INCLUDES /l 0x409 /d "NDEBUG"
+# ADD RSC COMPILE_DEFINITIONS
+# ADD RSC COMPILE_DEFINITIONS_RELWITHDEBINFO
 BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo