[Cmake-commits] CMake branch, next, updated. v2.8.9-353-gb35b96f

[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  b35b96f5dba805ea5e2369de55fbb54a1600c3df (commit)
       via  11a6dac1e3ab9f93fbf764ec0eb898b20152a762 (commit)
      from  cc70b2151b4344d0c0dd79259d612d05eda09e1d (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=b35b96f5dba805ea5e2369de55fbb54a1600c3df
commit b35b96f5dba805ea5e2369de55fbb54a1600c3df
Merge: cc70b21 11a6dac
Author:     Peter Kuemmel <syntheticpp at gmx.net>
AuthorDate: Tue Sep 4 14:28:27 2012 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Tue Sep 4 14:28:27 2012 -0400

    Merge topic 'ninja-cmcldeps-first-line' into next
    
    11a6dac Ninja: don't suppress warning about compiler options


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=11a6dac1e3ab9f93fbf764ec0eb898b20152a762
commit 11a6dac1e3ab9f93fbf764ec0eb898b20152a762
Author:     Peter Kümmel <syntheticpp at gmx.net>
AuthorDate: Tue Sep 4 20:23:53 2012 +0200
Commit:     Peter Kümmel <syntheticpp at gmx.net>
CommitDate: Tue Sep 4 20:23:53 2012 +0200

    Ninja: don't suppress warning about compiler options
    
    Warnings about invalid compiler options are printed first
    by cl.exe, this line was suppressed when the source file
    name didn't contain back slashes.

diff --git a/Source/cmcldeps.cxx b/Source/cmcldeps.cxx
index 69df88d..34350bf 100644
--- a/Source/cmcldeps.cxx
+++ b/Source/cmcldeps.cxx
@@ -238,7 +238,9 @@ int main() {
   // needed to suppress filename output of msvc tools
   std::string srcfilename;
   std::string::size_type pos = srcfile.rfind("\\");
-  if (pos != std::string::npos) {
+  if (pos == std::string::npos) {
+    srcfilename = srcfile;
+  } else {
     srcfilename = srcfile.substr(pos + 1);
   }
 

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

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


hooks/post-receive
-- 
CMake