[Cmake-commits] CMake branch, next, updated. v2.8.9-3085-g10197f9

[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  10197f9429604c7aaf64fc25afa77d459b121aa7 (commit)
       via  68bc863d5bd64f3e893722e403d4fd56bd2e175a (commit)
       via  a05eba57b50fa3224ed7579a604f9a84c44c6d02 (commit)
       via  9acb4f118cd9a52aaa66897b1c0cd11dace3851c (commit)
      from  c5b55fad94428b12d4a2a62fa66ed4613ef534f4 (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=10197f9429604c7aaf64fc25afa77d459b121aa7
commit 10197f9429604c7aaf64fc25afa77d459b121aa7
Merge: c5b55fa 68bc863
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Tue Aug 14 08:28:17 2012 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Tue Aug 14 08:28:17 2012 -0400

    Merge topic 'cleanup-style' into next
    
    68bc863 Merge branch 'master' into cleanup-style
    a05eba5 CMakeVersion.bash: Update sed expression for lower-case 'set'
    9acb4f1 CMake Nightly Date Stamp


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=68bc863d5bd64f3e893722e403d4fd56bd2e175a
commit 68bc863d5bd64f3e893722e403d4fd56bd2e175a
Merge: a05eba5 9acb4f1
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Tue Aug 14 08:27:23 2012 -0400
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Tue Aug 14 08:27:23 2012 -0400

    Merge branch 'master' into cleanup-style
    
    Conflicts:
    	Source/CMakeVersion.cmake

diff --cc Source/CMakeVersion.cmake
index a18d820,722474f..3632bc9
--- a/Source/CMakeVersion.cmake
+++ b/Source/CMakeVersion.cmake
@@@ -1,6 -1,6 +1,6 @@@
  # CMake version number components.
 -SET(CMake_VERSION_MAJOR 2)
 -SET(CMake_VERSION_MINOR 8)
 -SET(CMake_VERSION_PATCH 9)
 -SET(CMake_VERSION_TWEAK 20120814)
 -#SET(CMake_VERSION_RC 1)
 +set(CMake_VERSION_MAJOR 2)
 +set(CMake_VERSION_MINOR 8)
 +set(CMake_VERSION_PATCH 9)
- set(CMake_VERSION_TWEAK 20120813)
++set(CMake_VERSION_TWEAK 20120814)
 +#set(CMake_VERSION_RC 1)

http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=a05eba57b50fa3224ed7579a604f9a84c44c6d02
commit a05eba57b50fa3224ed7579a604f9a84c44c6d02
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Tue Aug 14 08:25:07 2012 -0400
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Tue Aug 14 08:25:51 2012 -0400

    CMakeVersion.bash: Update sed expression for lower-case 'set'
    
    Since commit 77543bde (Convert CMake-language commands to lower case,
    2012-08-13) the CMakeVersion.cmake file contains lower-case 'set'
    commands.  Teach CMakeVersion.bash to replace the lower-case name
    instead of the old upper-case 'SET'.

diff --git a/Source/CMakeVersion.bash b/Source/CMakeVersion.bash
index 126adba..4794e60 100755
--- a/Source/CMakeVersion.bash
+++ b/Source/CMakeVersion.bash
@@ -3,5 +3,5 @@
 if test "x$1" = "x-f"; then shift ; n='*' ; else n='\{8\}' ; fi
 if test "$#" -gt 0; then echo 1>&2 "usage: CMakeVersion.bash [-f]"; exit 1; fi
 sed -i -e '
-s/\(^SET(CMake_VERSION_TWEAK\) [0-9]'"$n"'\(.*\)/\1 '"$(date +%Y%m%d)"'\2/
+s/\(^set(CMake_VERSION_TWEAK\) [0-9]'"$n"'\(.*\)/\1 '"$(date +%Y%m%d)"'\2/
 ' "${BASH_SOURCE%/*}/CMakeVersion.cmake"

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

Summary of changes:
 Source/CMakeVersion.bash  |    2 +-
 Source/CMakeVersion.cmake |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)


hooks/post-receive
-- 
CMake