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

[cmake-commits at cmake.org]

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

Modified Files:
	cmLocalVisualStudio6Generator.cxx 
Log Message:
BUG: fix for bug #8216


Index: cmLocalVisualStudio6Generator.cxx
===================================================================
RCS file: /cvsroot/CMake/CMake/Source/cmLocalVisualStudio6Generator.cxx,v
retrieving revision 1.145
retrieving revision 1.146
diff -C 2 -d -r1.145 -r1.146
*** cmLocalVisualStudio6Generator.cxx	3 Dec 2008 20:35:35 -0000	1.145
--- cmLocalVisualStudio6Generator.cxx	4 Dec 2008 13:57:27 -0000	1.146
***************
*** 1529,1539 ****
      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
--- 1529,1538 ----
      this->AppendDefines(minsizeDefines,target.GetProperty("COMPILE_DEFINITIONS_MINSIZEREL"), 0);
      this->AppendDefines(debugrelDefines,target.GetProperty("COMPILE_DEFINITIONS_RELWITHDEBINFO"), 0);
!     flags += defines;
!     flagsDebug += debugDefines;
!     flagsRelease += releaseDefines;
!     flagsMinSize += minsizeDefines;
!     flagsDebugRel += debugrelDefines;
!  
      // 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