[Cmake-commits] CMake branch, next, updated. v2.8.10.2-2156-g9d59291

[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  9d59291ecffb12984ec6dcf1ee0e752dfe54eda7 (commit)
       via  303014279a160ea73777426d63cdf2c7f794018f (commit)
      from  7bdc4a3482a570c572506ec5662ef2760542aeed (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=9d59291ecffb12984ec6dcf1ee0e752dfe54eda7
commit 9d59291ecffb12984ec6dcf1ee0e752dfe54eda7
Merge: 7bdc4a3 3030142
Author:     Peter Kuemmel <syntheticpp at gmx.net>
AuthorDate: Sat Feb 16 10:17:44 2013 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Sat Feb 16 10:17:44 2013 -0500

    Merge topic 'ninja-absolute-paths' into next
    
    3030142 Revert "Ninja: use absolute paths for sources and includes"


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=303014279a160ea73777426d63cdf2c7f794018f
commit 303014279a160ea73777426d63cdf2c7f794018f
Author:     Peter Kümmel <syntheticpp at gmx.net>
AuthorDate: Sat Feb 16 16:14:23 2013 +0100
Commit:     Peter Kümmel <syntheticpp at gmx.net>
CommitDate: Sat Feb 16 16:14:52 2013 +0100

    Revert "Ninja: use absolute paths for sources and includes"
    
    This reverts commit df7f1790b7cf69def45f55cb03ce0f9cef1eddb5.
    
    It shows that absolute paths breaks dependency tracing and adds
    lot of emtpy build commands.

diff --git a/Source/cmNinjaTargetGenerator.cxx b/Source/cmNinjaTargetGenerator.cxx
index ad2b0e8..f8e4399 100644
--- a/Source/cmNinjaTargetGenerator.cxx
+++ b/Source/cmNinjaTargetGenerator.cxx
@@ -158,7 +158,9 @@ cmNinjaTargetGenerator::ComputeFlagsForObject(cmSourceFile *source,
                                               this->GeneratorTarget,
                                               language.c_str(), config);
   std::string includeFlags =
-    this->LocalGenerator->GetIncludeFlags(includes, language.c_str(), true);
+    this->LocalGenerator->GetIncludeFlags(includes, language.c_str(),
+    language == "RC" ? true : false); // full include paths for RC
+                                      // needed by cmcldeps
   if(cmGlobalNinjaGenerator::IsMinGW())
     cmSystemTools::ReplaceString(includeFlags, "\\", "/");
 
@@ -277,11 +279,7 @@ std::string
 cmNinjaTargetGenerator
 ::GetSourceFilePath(cmSourceFile* source) const
 {
-  std::string result = source->GetFullPath();
-#ifdef _WIN32
-  cmSystemTools::ReplaceString(result, "/", "\\");
-#endif
-  return result;
+  return ConvertToNinjaPath(source->GetFullPath().c_str());
 }
 
 std::string

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

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


hooks/post-receive
-- 
CMake