[Cmake-commits] CMake branch, next, updated. v2.8.8-3188-g98b43a1

[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  98b43a127d8a5a4e6204e64a16f2783a4fe42273 (commit)
       via  ab245ff3c824797a5a7437330e077a2e6a58593b (commit)
      from  972b44c7dba81b5f557cbae626a39cb34d1414e0 (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=98b43a127d8a5a4e6204e64a16f2783a4fe42273
commit 98b43a127d8a5a4e6204e64a16f2783a4fe42273
Merge: 972b44c ab245ff
Author:     Peter Kuemmel <syntheticpp at gmx.net>
AuthorDate: Fri Jun 15 07:11:10 2012 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Fri Jun 15 07:11:10 2012 -0400

    Merge topic 'ninja-cldeps' into next
    
    ab245ff Ninja: but cl supports /nologo ...


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=ab245ff3c824797a5a7437330e077a2e6a58593b
commit ab245ff3c824797a5a7437330e077a2e6a58593b
Author:     Peter Kuemmel <syntheticpp at gmx.net>
AuthorDate: Fri Jun 15 13:07:05 2012 +0200
Commit:     Peter Kuemmel <syntheticpp at gmx.net>
CommitDate: Fri Jun 15 13:07:05 2012 +0200

    Ninja: but cl supports /nologo ...

diff --git a/Source/cmcldeps.cxx b/Source/cmcldeps.cxx
index c177178..1d69608 100644
--- a/Source/cmcldeps.cxx
+++ b/Source/cmcldeps.cxx
@@ -683,10 +683,11 @@ int main() {
     srcfilename = srcfile.substr(pos + 1);
   }
 
+  std::string nol = " /nologo ";
   std::string show = " /showIncludes ";
   if (lang == "C" || lang == "CXX") {
     return process(srcfilename, dfile, objfile, prefix,
-                   binpath + show + rest);
+                   binpath + nol + show + rest);
   } else if (lang == "RC") {
     // "misuse" cl.exe to get headers from .rc files
 
@@ -701,10 +702,10 @@ int main() {
 
     // extract dependencies with cl.exe
     process(srcfilename, dfile, objfile,
-                  prefix, cl + show + clrest, true);
+                  prefix, cl + nol + show + clrest, true);
 
     // compile rc file with rc.exe
-    return process(srcfilename, "" , objfile, prefix, binpath + nol + rest);
+    return process(srcfilename, "" , objfile, prefix, binpath + rest);
   }
 
   usage("Invalid language specified.");

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

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


hooks/post-receive
-- 
CMake