[Cmake-commits] CMake branch, master, updated. v2.8.7-832-g046f0f8

[David Cole]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "CMake".

The branch, master has been updated
       via  046f0f869e2a33f6252012fab5cbb3a6d9b4548c (commit)
       via  3fd0dde23ea692419fe2399cc6e0c4ee089c2ae3 (commit)
       via  d2c764ad8db1a2d920e43f5c78d4ff4b1f643cee (commit)
      from  c89264e275e6e9a11614f017da096d87410beb15 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=046f0f869e2a33f6252012fab5cbb3a6d9b4548c
commit 046f0f869e2a33f6252012fab5cbb3a6d9b4548c
Merge: c89264e 3fd0dde
Author:     David Cole <david.cole at kitware.com>
AuthorDate: Tue Apr 3 15:59:48 2012 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Tue Apr 3 15:59:48 2012 -0400

    Merge topic 'ninja-generated-def'
    
    3fd0dde Merge branch 'test-generated-def' into ninja-generated-def
    d2c764a Ninja: Fix module .def file path conversion

diff --cc Source/cmNinjaTargetGenerator.cxx
index c76d175,3f7c925..c6469f2
--- a/Source/cmNinjaTargetGenerator.cxx
+++ b/Source/cmNinjaTargetGenerator.cxx
@@@ -409,18 -400,12 +409,23 @@@ cmNinjaTargetGenerato
      {
      this->WriteObjectBuildStatement(*si);
      }
+   if(!this->GeneratorTarget->ModuleDefinitionFile.empty())
+     {
+     this->ModuleDefinitionFile = this->ConvertToNinjaPath(
+       this->GeneratorTarget->ModuleDefinitionFile.c_str());
+     }
  
 +  {
 +  // Add object library contents as external objects.
 +  std::vector<std::string> objs;
 +  this->GeneratorTarget->UseObjectLibraries(objs);
 +  for(std::vector<std::string>::iterator oi = objs.begin();
 +      oi != objs.end(); ++oi)
 +    {
 +    this->Objects.push_back(ConvertToNinjaPath(oi->c_str()));
 +    }
 +  }
 +
    this->GetBuildFileStream() << "\n";
  }
  

-----------------------------------------------------------------------

Summary of changes:
 Source/cmNinjaTargetGenerator.cxx |   13 +++++++++----
 Source/cmNinjaTargetGenerator.h   |    3 +++
 2 files changed, 12 insertions(+), 4 deletions(-)


hooks/post-receive
-- 
CMake