[Cmake-commits] CMake branch, next, updated. v2.8.8-3186-g972b44c

[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  972b44c7dba81b5f557cbae626a39cb34d1414e0 (commit)
       via  bf58e9adec832608c35119ce7d5334ec750c15d2 (commit)
      from  97eed5ac2906f84569e15a5984db6dafe00b823f (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=972b44c7dba81b5f557cbae626a39cb34d1414e0
commit 972b44c7dba81b5f557cbae626a39cb34d1414e0
Merge: 97eed5a bf58e9a
Author:     Peter Kuemmel <syntheticpp at gmx.net>
AuthorDate: Fri Jun 15 06:50:14 2012 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Fri Jun 15 06:50:14 2012 -0400

    Merge topic 'ninja-cldeps' into next
    
    bf58e9a Ninja: no /nologo option in old rc.exe


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=bf58e9adec832608c35119ce7d5334ec750c15d2
commit bf58e9adec832608c35119ce7d5334ec750c15d2
Author:     Peter Kuemmel <syntheticpp at gmx.net>
AuthorDate: Fri Jun 15 12:47:40 2012 +0200
Commit:     Peter Kuemmel <syntheticpp at gmx.net>
CommitDate: Fri Jun 15 12:49:01 2012 +0200

    Ninja: no /nologo option in old rc.exe

diff --git a/Source/cmcldeps.cxx b/Source/cmcldeps.cxx
index d2c22a2..c177178 100644
--- a/Source/cmcldeps.cxx
+++ b/Source/cmcldeps.cxx
@@ -683,11 +683,10 @@ 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 + nol + show + rest);
+                   binpath + show + rest);
   } else if (lang == "RC") {
     // "misuse" cl.exe to get headers from .rc files
 
@@ -702,7 +701,7 @@ int main() {
 
     // extract dependencies with cl.exe
     process(srcfilename, dfile, objfile,
-                  prefix, cl + nol + show + clrest, true);
+                  prefix, cl + show + clrest, true);
 
     // compile rc file with rc.exe
     return process(srcfilename, "" , objfile, prefix, binpath + nol + rest);

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

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


hooks/post-receive
-- 
CMake