BUG: fix for rc and vs6

5 files changed, 66 insertions, 25 deletions

diff --git a/Source/cmLocalVisualStudio6Generator.cxx b/Source/cmLocalVisualStudio6Generator.cxx
index aa29f04..846a6ca 100644
--- a/Source/cmLocalVisualStudio6Generator.cxx
+++ b/Source/cmLocalVisualStudio6Generator.cxx
@@ -1511,31 +1511,29 @@ void cmLocalVisualStudio6Generator
       }
 
     // 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 @@ void cmLocalVisualStudio6Generator
     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;
     }
 }
diff --git a/Templates/DLLHeader.dsptemplate b/Templates/DLLHeader.dsptemplate
index 20bc778..eb703b2 100644
--- a/Templates/DLLHeader.dsptemplate
+++ b/Templates/DLLHeader.dsptemplate
@@ -66,6 +66,8 @@ RSC=rc.exe
 # 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 @@ CMAKE_CUSTOM_RULE_CODE_RELEASE
 # 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 @@ CMAKE_CUSTOM_RULE_CODE_DEBUG
 # 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 @@ CMAKE_CUSTOM_RULE_CODE_MINSIZEREL
 # 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

diff --git a/Templates/EXEHeader.dsptemplate b/Templates/EXEHeader.dsptemplate
index cf58f06..a4c03dd 100644
--- a/Templates/EXEHeader.dsptemplate
+++ b/Templates/EXEHeader.dsptemplate
@@ -63,6 +63,8 @@ RSC=rc.exe
 # 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 @@ CMAKE_CUSTOM_RULE_CODE_RELEASE
 # 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 @@ CMAKE_CUSTOM_RULE_CODE_DEBUG
 # 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 @@ CMAKE_CUSTOM_RULE_CODE_MINSIZEREL
 # 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

diff --git a/Templates/EXEWinHeader.dsptemplate b/Templates/EXEWinHeader.dsptemplate
index 0a68d7f..d2f7e61 100644
--- a/Templates/EXEWinHeader.dsptemplate
+++ b/Templates/EXEWinHeader.dsptemplate
@@ -65,6 +65,8 @@ RSC=rc.exe
 # 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 @@ CMAKE_CUSTOM_RULE_CODE_RELEASE
 # 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 @@ CMAKE_CUSTOM_RULE_CODE_DEBUG
 # 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 @@ CMAKE_CUSTOM_RULE_CODE_MINSIZEREL
 # 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

diff --git a/Templates/staticLibHeader.dsptemplate b/Templates/staticLibHeader.dsptemplate
index 9ef1822..57fad98 100644
--- a/Templates/staticLibHeader.dsptemplate
+++ b/Templates/staticLibHeader.dsptemplate
@@ -60,6 +60,8 @@ RSC=rc.exe
 # 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 @@ CMAKE_CUSTOM_RULE_CODE_RELEASE
 # 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 @@ CMAKE_CUSTOM_RULE_CODE_DEBUG
 # 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 @@ CMAKE_CUSTOM_RULE_CODE_MINSIZEREL
 # 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