[Cmake-commits] CMake branch, next, updated. v2.8.8-3509-gf22d19f

[Peter Kuemmel]

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, next has been updated
       via  f22d19f4edb4f96e869efbe2d20267e9186c352e (commit)
       via  74d1c88529caa6d048418ea36e09a1d446472d33 (commit)
      from  95a46a24e5bfe3afc1ec248dbd291da37c1aaa8c (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=f22d19f4edb4f96e869efbe2d20267e9186c352e
commit f22d19f4edb4f96e869efbe2d20267e9186c352e
Merge: 95a46a2 74d1c88
Author:     Peter Kuemmel <syntheticpp at gmx.net>
AuthorDate: Tue Jul 17 12:56:03 2012 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Tue Jul 17 12:56:03 2012 -0400

    Merge topic 'ninja-cldeps-check-rc-result' into next
    
    74d1c88 Ninja: cmcldeps needs absolute paths for RCs


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=74d1c88529caa6d048418ea36e09a1d446472d33
commit 74d1c88529caa6d048418ea36e09a1d446472d33
Author:     Peter Kümmel <syntheticpp at gmx.net>
AuthorDate: Tue Jul 17 18:54:56 2012 +0200
Commit:     Peter Kümmel <syntheticpp at gmx.net>
CommitDate: Tue Jul 17 18:54:56 2012 +0200

    Ninja: cmcldeps needs absolute paths for RCs

diff --git a/Source/cmNinjaTargetGenerator.cxx b/Source/cmNinjaTargetGenerator.cxx
index 7eb3d9e..0d02039 100644
--- a/Source/cmNinjaTargetGenerator.cxx
+++ b/Source/cmNinjaTargetGenerator.cxx
@@ -469,7 +469,7 @@ cmNinjaTargetGenerator
   cmNinjaDeps emptyDeps;
 
   std::string comment;
-  const char* language = source->GetLanguage();
+  const std::string language = source->GetLanguage();
   std::string rule = this->LanguageCompilerRule(language);
 
   cmNinjaDeps outputs;
@@ -479,7 +479,11 @@ cmNinjaTargetGenerator
   this->Objects.push_back(objectFileName);
 
   cmNinjaDeps explicitDeps;
-  std::string sourceFileName = this->GetSourceFilePath(source);
+  std::string sourceFileName;
+  if (language == "RC")
+    sourceFileName = source->GetFullPath();
+  else
+    sourceFileName = this->GetSourceFilePath(source);
   explicitDeps.push_back(sourceFileName);
 
   // Ensure that the target dependencies are built before any source file in

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

Summary of changes:
 Source/cmNinjaTargetGenerator.cxx |    8 ++++++--
 1 files changed, 6 insertions(+), 2 deletions(-)


hooks/post-receive
-- 
CMake