[Cmake-commits] [cmake-commits] king committed cmVisualStudio10TargetGenerator.cxx 1.17 1.18

[cmake-commits at cmake.org]

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

Modified Files:
	cmVisualStudio10TargetGenerator.cxx 
Log Message:
Do not parse preprocessor defs for VS 10 link/lib

When constructing cmVisualStudioGeneratorOptions to parse options for
tools 'link' and 'lib' the tool type is now Linker, not Compiler.  This
tells it not to recognize flags starting in '/D' as preprocessor macros,
such as the '/DEF:<file>' linker option.  See issue #9613.


Index: cmVisualStudio10TargetGenerator.cxx
===================================================================
RCS file: /cvsroot/CMake/CMake/Source/cmVisualStudio10TargetGenerator.cxx,v
retrieving revision 1.17
retrieving revision 1.18
diff -C 2 -d -r1.17 -r1.18
*** cmVisualStudio10TargetGenerator.cxx	29 Sep 2009 01:19:20 -0000	1.17
--- cmVisualStudio10TargetGenerator.cxx	29 Sep 2009 20:38:43 -0000	1.18
***************
*** 952,959 ****
      {
      this->WriteString("<Lib>\n", 2);
!     cmVisualStudioGeneratorOptions 
!       libOptions(this->LocalGenerator,
!                   10, cmVisualStudioGeneratorOptions::Compiler,
!                   cmVS10LibFlagTable, 0, this); 
      libOptions.Parse(libflags);  
      libOptions.OutputAdditionalOptions(*this->BuildFileStream, "      ", "");
--- 952,959 ----
      {
      this->WriteString("<Lib>\n", 2);
!     cmVisualStudioGeneratorOptions
!       libOptions(this->LocalGenerator, 10,
!                  cmVisualStudioGeneratorOptions::Linker,
!                  cmVS10LibFlagTable, 0, this);
      libOptions.Parse(libflags);  
      libOptions.OutputAdditionalOptions(*this->BuildFileStream, "      ", "");
***************
*** 1024,1031 ****
      flags += targetLinkFlags;
      }
!   cmVisualStudioGeneratorOptions 
!     linkOptions(this->LocalGenerator, 
!               10, cmVisualStudioGeneratorOptions::Compiler,
!                 cmVS10LinkFlagTable);
    if ( this->Target->GetPropertyAsBool("WIN32_EXECUTABLE") )
      {
--- 1024,1031 ----
      flags += targetLinkFlags;
      }
!   cmVisualStudioGeneratorOptions
!     linkOptions(this->LocalGenerator, 10,
!                 cmVisualStudioGeneratorOptions::Linker,
!                 cmVS10LinkFlagTable, 0, this);
    if ( this->Target->GetPropertyAsBool("WIN32_EXECUTABLE") )
      {