[Cmake-commits] CMake branch, next, updated. v2.8.7-2476-g1036a1f

[Brad King]

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  1036a1f6c298baeb29018a5838de813a9b2c7392 (commit)
       via  415ffda7a8ca0dfea2e00353a65fb31d8fadfb75 (commit)
       via  1dd43c4c9d6d921b38288802d0560f92c90a0c08 (commit)
       via  34cc537132e843d07c3bdeb0ccaa06e82f9aef88 (commit)
       via  a1979dc0e95a6b86495b669076f892cd362bda9f (commit)
      from  e09c1297d8777207dacbb2c35e5b17eec9212452 (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=1036a1f6c298baeb29018a5838de813a9b2c7392
commit 1036a1f6c298baeb29018a5838de813a9b2c7392
Merge: e09c129 415ffda
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Mon Feb 6 10:25:17 2012 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Mon Feb 6 10:25:17 2012 -0500

    Merge topic 'fix-ccmake-clear' into next
    
    415ffda ccmake: Extend clear line.
    1dd43c4 ccmake: Factor clear line.
    34cc537 KWSys Nightly Date Stamp
    a1979dc KWSys Nightly Date Stamp


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=415ffda7a8ca0dfea2e00353a65fb31d8fadfb75
commit 415ffda7a8ca0dfea2e00353a65fb31d8fadfb75
Author:     Nicolas Despres <nicolas.despres at gmail.com>
AuthorDate: Sun Feb 5 16:56:47 2012 +0100
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Mon Feb 6 10:23:50 2012 -0500

    ccmake: Extend clear line.
    
    When configuring or generating the 'ng' of the end of the second line
    is not cleared.  This patch fixes this.
    
    The problem was introduced by commit fd632195 (ccmake: Align 'g' and 'q'
    key instructions, 2011-01-07) which adjusted the length of lines that
    need clearing.

diff --git a/Source/CursesDialog/cmCursesMainForm.cxx b/Source/CursesDialog/cmCursesMainForm.cxx
index 6b7d89e..4fee0bb 100644
--- a/Source/CursesDialog/cmCursesMainForm.cxx
+++ b/Source/CursesDialog/cmCursesMainForm.cxx
@@ -410,7 +410,7 @@ void cmCursesMainForm::PrintKeys(int process /* = 0 */)
   if (process)
     {
     const char* clearLine =
-      "                                                               ";
+      "                                                                    ";
     strcpy(firstLine, clearLine);
     strcpy(secondLine, clearLine);
     strcpy(thirdLine, clearLine);

http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=1dd43c4c9d6d921b38288802d0560f92c90a0c08
commit 1dd43c4c9d6d921b38288802d0560f92c90a0c08
Author:     Nicolas Despres <nicolas.despres at gmail.com>
AuthorDate: Sun Feb 5 15:09:37 2012 +0100
Commit:     Nicolas Despres <nicolas.despres at gmail.com>
CommitDate: Sun Feb 5 15:09:37 2012 +0100

    ccmake: Factor clear line.

diff --git a/Source/CursesDialog/cmCursesMainForm.cxx b/Source/CursesDialog/cmCursesMainForm.cxx
index 6c7627f..6b7d89e 100644
--- a/Source/CursesDialog/cmCursesMainForm.cxx
+++ b/Source/CursesDialog/cmCursesMainForm.cxx
@@ -409,12 +409,11 @@ void cmCursesMainForm::PrintKeys(int process /* = 0 */)
   char thirdLine[512]="";
   if (process)
     {
-    sprintf(firstLine,
-            "                                                               ");
-    sprintf(secondLine,
-            "                                                               ");
-    sprintf(thirdLine,
-            "                                                               ");
+    const char* clearLine =
+      "                                                               ";
+    strcpy(firstLine, clearLine);
+    strcpy(secondLine, clearLine);
+    strcpy(thirdLine, clearLine);
     }
   else
     {

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

Summary of changes:
 Source/CursesDialog/cmCursesMainForm.cxx |   11 +++++------
 Source/kwsys/kwsysDateStamp.cmake        |    2 +-
 2 files changed, 6 insertions(+), 7 deletions(-)


hooks/post-receive
-- 
CMake