[Cmake-commits] [cmake-commits] hoffman committed cmVisualStudio10TargetGenerator.cxx 1.4 1.5

[cmake-commits at cmake.org]

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

Modified Files:
	cmVisualStudio10TargetGenerator.cxx 
Log Message:
ENH: fix line length


Index: cmVisualStudio10TargetGenerator.cxx
===================================================================
RCS file: /cvsroot/CMake/CMake/Source/cmVisualStudio10TargetGenerator.cxx,v
retrieving revision 1.4
retrieving revision 1.5
diff -C 2 -d -r1.4 -r1.5
*** cmVisualStudio10TargetGenerator.cxx	26 Jun 2009 15:50:09 -0000	1.4
--- cmVisualStudio10TargetGenerator.cxx	28 Jun 2009 12:59:56 -0000	1.5
***************
*** 27,30 ****
--- 27,31 ----
  #include "cmVS10CLFlagTable.h"
  #include "cmVS10LinkFlagTable.h"
+ #include "cmVS10LibFlagTable.h"
  
  
***************
*** 396,401 ****
          source != sources.end(); ++source)
        {
!       // if it is not a custom command then add it as a c file,
!       // TODO: need to check for idl or rc, or exclude from build
        if(!(*source)->GetCustomCommand()
           && !(*source)->GetPropertyAsBool("HEADER_FILE_ONLY")
--- 397,402 ----
          source != sources.end(); ++source)
        {
!       // if it is not a custom command then add it as a c/c++ file,
!       // TODO: need to check for idl or rc
        if(!(*source)->GetCustomCommand()
           && !(*source)->GetPropertyAsBool("HEADER_FILE_ONLY")
***************
*** 509,514 ****
        clOptions.OutputAdditionalOptions(*this->BuildFileStream, "      ", "");
        clOptions.OutputFlagMap(*this->BuildFileStream, "      "); 
!       clOptions.OutputPreprocessorDefinitions(*this->BuildFileStream, "      ", 
!                                               "\n");
        
        }
--- 510,515 ----
        clOptions.OutputAdditionalOptions(*this->BuildFileStream, "      ", "");
        clOptions.OutputFlagMap(*this->BuildFileStream, "      "); 
!       clOptions.OutputPreprocessorDefinitions(*this->BuildFileStream,
!                                               "      ", "\n");
        
        }
***************
*** 741,744 ****
--- 742,768 ----
  
  
+ void cmVisualStudio10TargetGenerator::WriteLibOptions(std::string const&
+                                                       )
+ {
+   if(this->Target->GetType() != cmTarget::STATIC_LIBRARY)
+     {
+     return;
+     }
+   if(const char* libflags = this->Target
+      ->GetProperty("STATIC_LIBRARY_FLAGS"))
+     {
+     this->WriteString("<Lib>\n", 2);
+     cmVisualStudioGeneratorOptions 
+       libOptions(this->LocalGenerator,
+                   10, cmVisualStudioGeneratorOptions::Compiler,
+                   cmVS10LibFlagTable, 0, this); 
+     libOptions.Parse(libflags);  
+     libOptions.OutputAdditionalOptions(*this->BuildFileStream, "      ", "");
+     libOptions.OutputFlagMap(*this->BuildFileStream, "      "); 
+     this->WriteString("</Lib>\n", 2);
+     }
+ }
+ 
+ 
  void cmVisualStudio10TargetGenerator::WriteLinkOptions(std::string const&
                                                         config)
***************
*** 975,981 ****
      //    output midl flags       <Midl></Midl>
      this->WriteMidlOptions(*i, includes);
!     //    output link flags       <Link></Link> or <Lib></Lib>
      this->WriteLinkOptions(*i);
!     // TODO:  need a WriteLibOptions for static
      this->WriteString("</ItemDefinitionGroup>\n", 1);
      }
--- 999,1006 ----
      //    output midl flags       <Midl></Midl>
      this->WriteMidlOptions(*i, includes);
!     //    output link flags       <Link></Link> 
      this->WriteLinkOptions(*i);
!     //    output lib flags       <Lib></Lib> 
!     this->WriteLibOptions(*i);
      this->WriteString("</ItemDefinitionGroup>\n", 1);
      }