[Cmake-commits] [cmake-commits] hoffman committed cmVisualStudio10TargetGenerator.h 1.1 1.2 cmVisualStudio10TargetGenerator.cxx 1.1 1.2

[cmake-commits at cmake.org]

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

Modified Files:
	cmVisualStudio10TargetGenerator.h 
	cmVisualStudio10TargetGenerator.cxx 
Log Message:
ENH: add obj file support and remove a warning


Index: cmVisualStudio10TargetGenerator.h
===================================================================
RCS file: /cvsroot/CMake/CMake/Source/cmVisualStudio10TargetGenerator.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -C 2 -d -r1.1 -r1.2
*** cmVisualStudio10TargetGenerator.h	25 Jun 2009 20:41:56 -0000	1.1
--- cmVisualStudio10TargetGenerator.h	26 Jun 2009 02:53:02 -0000	1.2
***************
*** 50,54 ****
    void WriteProjectConfigurations();
    void WriteProjectConfigurationValues();
!   void WriteSources();
    void WritePathAndIncrementalLinkOptions();
    void WriteItemDefinitionGroups();
--- 50,55 ----
    void WriteProjectConfigurations();
    void WriteProjectConfigurationValues();
!   void WriteCLSources();
!   void WriteObjSources();
    void WritePathAndIncrementalLinkOptions();
    void WriteItemDefinitionGroups();

Index: cmVisualStudio10TargetGenerator.cxx
===================================================================
RCS file: /cvsroot/CMake/CMake/Source/cmVisualStudio10TargetGenerator.cxx,v
retrieving revision 1.1
retrieving revision 1.2
diff -C 2 -d -r1.1 -r1.2
*** cmVisualStudio10TargetGenerator.cxx	25 Jun 2009 20:41:56 -0000	1.1
--- cmVisualStudio10TargetGenerator.cxx	26 Jun 2009 02:53:02 -0000	1.2
***************
*** 143,147 ****
    this->WriteItemDefinitionGroups();
    this->WriteCustomCommands();
!   this->WriteSources();
    this->WriteProjectReferences();
    this->WriteString(
--- 143,148 ----
    this->WriteItemDefinitionGroups();
    this->WriteCustomCommands();
!   this->WriteObjSources();
!   this->WriteCLSources();
    this->WriteProjectReferences();
    this->WriteString(
***************
*** 347,351 ****
  
  
! void cmVisualStudio10TargetGenerator::WriteSources()
  {
    this->WriteString("<ItemGroup>\n", 1);
--- 348,383 ----
  
  
! void cmVisualStudio10TargetGenerator::WriteObjSources()
! { 
!   if(this->Target->GetType() > cmTarget::MODULE_LIBRARY)
!     {
!     return;
!     }
!   bool first = true;
!   std::vector<cmSourceFile*>const & sources = this->Target->GetSourceFiles();
!   for(std::vector<cmSourceFile*>::const_iterator source = sources.begin();
!       source != sources.end(); ++source)
!     {
!     std::cerr << (*source)->GetExtension() << "\n";
!     std::cerr << (*source)->GetFullPath() << "\n";
!     if((*source)->GetExtension() == "obj")
!       {
!       if(first)
!         {
!         this->WriteString("<ItemGroup>\n", 1);
!         first = false;
!         }
!       this->WriteString("<None Include=\"", 2);
!       (*this->BuildFileStream ) << (*source)->GetFullPath() << "\" />\n";
!       }
!     }
!   if(!first)
!     {
!     this->WriteString("</ItemGroup>\n", 1); 
!     }
! }
! 
! 
! void cmVisualStudio10TargetGenerator::WriteCLSources()
  {
    this->WriteString("<ItemGroup>\n", 1);
***************
*** 591,596 ****
  void 
  cmVisualStudio10TargetGenerator::
! WriteClOptions(std::string const& 
!                configName,
                 std::vector<std::string> const & includes)
  {
--- 623,627 ----
  void 
  cmVisualStudio10TargetGenerator::
! WriteClOptions(std::string const& configName,
                 std::vector<std::string> const & includes)
  {
***************
*** 700,704 ****
  
  void cmVisualStudio10TargetGenerator::
! WriteRCOptions(std::string const& config,
                 std::vector<std::string> const & includes)
  {
--- 731,735 ----
  
  void cmVisualStudio10TargetGenerator::
! WriteRCOptions(std::string const& ,
                 std::vector<std::string> const & includes)
  {
***************
*** 899,904 ****
  
  void cmVisualStudio10TargetGenerator::
! WriteMidlOptions(std::string const&
!                  config,
                   std::vector<std::string> const & includes)
  {
--- 930,934 ----
  
  void cmVisualStudio10TargetGenerator::
! WriteMidlOptions(std::string const& /*config*/,
                   std::vector<std::string> const & includes)
  {
***************
*** 950,954 ****
  }
  
- // TODO handle .obj file direct stuff
  
  void cmVisualStudio10TargetGenerator::WriteProjectReferences()
--- 980,983 ----