[Cmake-commits] [cmake-commits] david.cole committed cmLocalVisualStudio7Generator.cxx 1.222 1.223

[cmake-commits at cmake.org]

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

Modified Files:
	cmLocalVisualStudio7Generator.cxx 
Log Message:
BUG: Fix for issue #6440. Use 0 instead of FALSE for ExceptionHandling with Visual Studio 2005 and later.


Index: cmLocalVisualStudio7Generator.cxx
===================================================================
RCS file: /cvsroot/CMake/CMake/Source/cmLocalVisualStudio7Generator.cxx,v
retrieving revision 1.222
retrieving revision 1.223
diff -C 2 -d -r1.222 -r1.223
*** cmLocalVisualStudio7Generator.cxx	8 Apr 2008 04:06:46 -0000	1.222
--- cmLocalVisualStudio7Generator.cxx	17 Apr 2008 15:16:53 -0000	1.223
***************
*** 408,411 ****
--- 408,412 ----
    };
    cmLocalVisualStudio7GeneratorOptions(cmLocalVisualStudio7Generator* lg,
+                                        int version,
                                         Tool tool,
                                         cmVS7FlagTable const* extraTable = 0);
***************
*** 440,443 ****
--- 441,445 ----
  private:
    cmLocalVisualStudio7Generator* LocalGenerator;
+   int Version;
  
    // create a map of xml tags to the values they should have in the output
***************
*** 552,556 ****
  
    // Construct a set of build options for this target.
!   Options targetOptions(this, Options::Compiler, this->ExtraFlagTable);
    targetOptions.FixExceptionHandlingDefault();
    targetOptions.Parse(flags.c_str());
--- 554,558 ----
  
    // Construct a set of build options for this target.
!   Options targetOptions(this, this->Version, Options::Compiler, this->ExtraFlagTable);
    targetOptions.FixExceptionHandlingDefault();
    targetOptions.Parse(flags.c_str());
***************
*** 746,750 ****
      extraLinkOptions += targetLinkFlags;
      }
!   Options linkOptions(this, Options::Linker);
    linkOptions.Parse(extraLinkOptions.c_str());
    switch(target.GetType())
--- 748,752 ----
      extraLinkOptions += targetLinkFlags;
      }
!   Options linkOptions(this, this->Version, Options::Linker);
    linkOptions.Parse(extraLinkOptions.c_str());
    switch(target.GetType())
***************
*** 1290,1294 ****
               !fc.CompileDefsConfig.empty())
              {
!             Options fileOptions(this, Options::Compiler,
                                  this->ExtraFlagTable);
              fileOptions.Parse(fc.CompileFlags.c_str());
--- 1292,1296 ----
               !fc.CompileDefsConfig.empty())
              {
!             Options fileOptions(this, this->Version, Options::Compiler,
                                  this->ExtraFlagTable);
              fileOptions.Parse(fc.CompileFlags.c_str());
***************
*** 1763,1769 ****
  cmLocalVisualStudio7GeneratorOptions
  ::cmLocalVisualStudio7GeneratorOptions(cmLocalVisualStudio7Generator* lg,
                                         Tool tool,
                                         cmVS7FlagTable const* extraTable):
!   LocalGenerator(lg), CurrentTool(tool),
    DoingDefine(false), FlagTable(0), ExtraFlagTable(extraTable)
  {
--- 1765,1772 ----
  cmLocalVisualStudio7GeneratorOptions
  ::cmLocalVisualStudio7GeneratorOptions(cmLocalVisualStudio7Generator* lg,
+                                        int version,
                                         Tool tool,
                                         cmVS7FlagTable const* extraTable):
!   LocalGenerator(lg), Version(version), CurrentTool(tool),
    DoingDefine(false), FlagTable(0), ExtraFlagTable(extraTable)
  {
***************
*** 1787,1791 ****
    // the flag to disable exception handling.  When the user does
    // remove the flag we need to override the IDE default of on.
!   this->FlagMap["ExceptionHandling"] = "FALSE";
  }
  
--- 1790,1804 ----
    // the flag to disable exception handling.  When the user does
    // remove the flag we need to override the IDE default of on.
!   switch (this->Version)
!     {
!     case 7:
!     case 71:
!       this->FlagMap["ExceptionHandling"] = "FALSE";
!     break;
! 
!     default:
!       this->FlagMap["ExceptionHandling"] = "0";
!     break;
!     }
  }