[Cmake-commits] [cmake-commits] hoffman committed cmLocalVisualStudio6Generator.cxx 1.144 1.145

[cmake-commits at cmake.org]

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

Modified Files:
	cmLocalVisualStudio6Generator.cxx 
Log Message:
BUG: fix for rc and vs6


Index: cmLocalVisualStudio6Generator.cxx
===================================================================
RCS file: /cvsroot/CMake/CMake/Source/cmLocalVisualStudio6Generator.cxx,v
retrieving revision 1.144
retrieving revision 1.145
diff -C 2 -d -r1.144 -r1.145
*** cmLocalVisualStudio6Generator.cxx	9 Sep 2008 17:04:30 -0000	1.144
--- cmLocalVisualStudio6Generator.cxx	3 Dec 2008 20:35:35 -0000	1.145
***************
*** 1512,1540 ****
  
      // 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);
  
      // The template files have CXX FLAGS in them, that need to be replaced.
--- 1512,1538 ----
  
      // Add per-target and per-configuration preprocessor definitions.
!     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.
***************
*** 1551,1554 ****
--- 1549,1563 ----
                                   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;
      }