[Cmake-commits] CMake branch, next, updated. v2.8.10.2-2154-g7bdc4a3

[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  7bdc4a3482a570c572506ec5662ef2760542aeed (commit)
       via  df7f1790b7cf69def45f55cb03ce0f9cef1eddb5 (commit)
      from  0b45a70936c45d89a137a0c75956789ad7150114 (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=7bdc4a3482a570c572506ec5662ef2760542aeed
commit 7bdc4a3482a570c572506ec5662ef2760542aeed
Merge: 0b45a70 df7f179
Author:     Peter Kuemmel <syntheticpp at gmx.net>
AuthorDate: Sat Feb 16 08:15:39 2013 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Sat Feb 16 08:15:39 2013 -0500

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


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

    Ninja: use absolute paths for sources and includes
    
    Thanks to Mika Fischer:
    
    Using relative paths makes it unnecessarily difficult for tools parsing
    the generated errors to find the referenced file. In particular, jumping
    to error locations in vim only works when the current directory is the
    root of the build directory, otherwise the relative paths in the error
    messages point to the wrong location.
    
    The Unix Makefile generator uses absolute filenames for source files and
    thus does not suffer from this.
    
    BUG 0013894

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

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

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


hooks/post-receive
-- 
CMake