[Cmake-commits] CMake branch, next, updated. v2.8.8-3107-g2b8129d

[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  2b8129de2a109a2c4666cbf681d73cc7eacf4976 (commit)
       via  7b91c3dfac88b2d01a8bac71e800032fcd03ec54 (commit)
       via  c54ef23c16cfa40c8016643d0a6471539f04fabe (commit)
      from  61c32257bf1fd4b8611e61f68ed75e3dec9194fe (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=2b8129de2a109a2c4666cbf681d73cc7eacf4976
commit 2b8129de2a109a2c4666cbf681d73cc7eacf4976
Merge: 61c3225 7b91c3d
Author:     Peter Kuemmel <syntheticpp at gmx.net>
AuthorDate: Mon Jun 11 18:53:10 2012 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Mon Jun 11 18:53:10 2012 -0400

    Merge topic 'ninja-cldeps' into next
    
    7b91c3d Millenium update: 79 * (16/9)/(4/3) = 105
    c54ef23 Line Length: <79


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=7b91c3dfac88b2d01a8bac71e800032fcd03ec54
commit 7b91c3dfac88b2d01a8bac71e800032fcd03ec54
Author:     Peter Kuemmel <syntheticpp at gmx.net>
AuthorDate: Tue Jun 12 00:51:27 2012 +0200
Commit:     Peter Kuemmel <syntheticpp at gmx.net>
CommitDate: Tue Jun 12 00:51:27 2012 +0200

    Millenium update: 79 * (16/9)/(4/3) = 105

diff --git a/Utilities/KWStyle/CMake.kws.xml.in b/Utilities/KWStyle/CMake.kws.xml.in
index c2b4429..faa6a73 100644
--- a/Utilities/KWStyle/CMake.kws.xml.in
+++ b/Utilities/KWStyle/CMake.kws.xml.in
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
 <Description>
-<LineLength>79</LineLength>
+<LineLength>105</LineLength>
 <!--
 <Header>"@CMake_SOURCE_DIR@/Utilities/KWStyle/Headers",false,true</Header>
 <Functions>

http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=c54ef23c16cfa40c8016643d0a6471539f04fabe
commit c54ef23c16cfa40c8016643d0a6471539f04fabe
Author:     Peter Kuemmel <syntheticpp at gmx.net>
AuthorDate: Tue Jun 12 00:51:08 2012 +0200
Commit:     Peter Kuemmel <syntheticpp at gmx.net>
CommitDate: Tue Jun 12 00:51:08 2012 +0200

    Line Length: <79

diff --git a/Source/cmNinjaTargetGenerator.cxx b/Source/cmNinjaTargetGenerator.cxx
index f66d1d3..02af738 100644
--- a/Source/cmNinjaTargetGenerator.cxx
+++ b/Source/cmNinjaTargetGenerator.cxx
@@ -341,7 +341,8 @@ cmNinjaTargetGenerator
     useClDeps = true;
     if (projectName && std::string(projectName) == "CMAKE_TRY_COMPILE")
       {
-      // don't wrap for try_compile, TODO but why doesn't it work with cmcldeps?
+      // don't wrap for try_compile,
+      // TODO but why doesn't it work with cmcldeps?
       useClDeps = false;
       }
     }
@@ -382,7 +383,8 @@ cmNinjaTargetGenerator
   if(useClDeps)
     {
     std::string prefix = clShowPrefix;
-    cmdLine = "\"" + std::string(clDepsBinary) + "\" $in $out.d $out \"" + prefix + "\" " + cmdLine;
+    cmdLine = "\"" + std::string(clDepsBinary) + "\" $in $out.d $out \""
+            + prefix + "\" " + cmdLine;
     }
 
   // Write the rule for compiling file of the given language.

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

Summary of changes:
 Source/cmNinjaTargetGenerator.cxx  |    6 ++++--
 Utilities/KWStyle/CMake.kws.xml.in |    2 +-
 2 files changed, 5 insertions(+), 3 deletions(-)


hooks/post-receive
-- 
CMake