[Cmake-commits] CMake branch, next, updated. v2.8.9-3081-gc5b55fa

[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  c5b55fad94428b12d4a2a62fa66ed4613ef534f4 (commit)
       via  3c0488d7d3557ac3840bd6f72ba18415699b1b44 (commit)
       via  6c2c483ef9ca8e7238df07b6230e714c314e40eb (commit)
      from  85b90b5ed2179c64c6da1d6c2109eaee42faeafb (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=c5b55fad94428b12d4a2a62fa66ed4613ef534f4
commit c5b55fad94428b12d4a2a62fa66ed4613ef534f4
Merge: 85b90b5 3c0488d
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Tue Aug 14 08:16:42 2012 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Tue Aug 14 08:16:42 2012 -0400

    Merge topic 'cleanup-style' into next
    
    3c0488d Fix WarnUnusedUnusedViaUnset test pass/fail regex
    6c2c483 Remove trailing TAB from NSIS.template.in


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=3c0488d7d3557ac3840bd6f72ba18415699b1b44
commit 3c0488d7d3557ac3840bd6f72ba18415699b1b44
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Tue Aug 14 08:02:34 2012 -0400
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Tue Aug 14 08:06:19 2012 -0400

    Fix WarnUnusedUnusedViaUnset test pass/fail regex
    
    After conversion of Modules .cmake files to lower case the
    FAIL_REGULAR_EXPRESSION for this test matched warnings in modules other
    than the test line itself.  Make the pass and fail regular expressions
    specific to the file containing the lines they are testing.

diff --git a/Tests/CMakeLists.txt b/Tests/CMakeLists.txt
index 651e1b9..9512ea6 100644
--- a/Tests/CMakeLists.txt
+++ b/Tests/CMakeLists.txt
@@ -1487,9 +1487,9 @@ ${CMake_BINARY_DIR}/bin/cmake -DVERSION=master -P ${CMake_SOURCE_DIR}/Utilities/
     --build-project WarnUnusedUnusedViaUnset
     --build-options "--warn-unused-vars")
   set_tests_properties(WarnUnusedUnusedViaUnset PROPERTIES
-    PASS_REGULAR_EXPRESSION "CMake Warning .*:7 \\(set\\):")
+    PASS_REGULAR_EXPRESSION "CMake Warning .*VariableUnusedViaUnset.CMakeLists.txt:7 \\(set\\):")
   set_tests_properties(WarnUnusedUnusedViaUnset PROPERTIES
-    FAIL_REGULAR_EXPRESSION "CMake Warning .*:5 \\(set\\):")
+    FAIL_REGULAR_EXPRESSION "CMake Warning .*VariableUnusedViaUnset.CMakeLists.txt:5 \\(set\\):")
   list(APPEND TEST_BUILD_DIRS "${CMake_BINARY_DIR}/Tests/WarnUnusedUnusedViaUnset")
 
   add_test(WarnUnusedCliUnused ${CMAKE_CTEST_COMMAND}

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

    Remove trailing TAB from NSIS.template.in
    
    This was missed by commit 7bbaa428 (Remove trailing whitespace from most
    CMake and C/C++ code, 2012-08-13) which only removed trailing spaces,
    not TABs.

diff --git a/Modules/NSIS.template.in b/Modules/NSIS.template.in
index 7adfe14..9e8a6d9 100644
--- a/Modules/NSIS.template.in
+++ b/Modules/NSIS.template.in
@@ -481,7 +481,7 @@ Loop:
 	StrCmp "$R2" "$\r" RTrim
 	StrCmp "$R2" ";" RTrim
 	GoTo Done
-RTrim:	
+RTrim:
 	StrCpy $R1 "$R1" -1
 	Goto Loop
 Done:

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

Summary of changes:
 Modules/NSIS.template.in |    2 +-
 Tests/CMakeLists.txt     |    4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)


hooks/post-receive
-- 
CMake