[Cmake-commits] CMake branch, next, updated. v3.2.0-rc2-743-g731f112

[Zack Galbreath]

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  731f11216cb3f40fd7ab5facfc037759e4e62838 (commit)
       via  ef4032f7262eb1486b6f83402c14be90dcddf7d9 (commit)
      from  9715186541d1b94762a36a85ad769339c13c9c60 (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=731f11216cb3f40fd7ab5facfc037759e4e62838
commit 731f11216cb3f40fd7ab5facfc037759e4e62838
Merge: 9715186 ef4032f
Author:     Zack Galbreath <zack.galbreath at kitware.com>
AuthorDate: Wed Feb 25 16:19:46 2015 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Wed Feb 25 16:19:46 2015 -0500

    Merge topic 'error_in_read_script' into next
    
    ef4032f7 more permissive output for BuildCompileError


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=ef4032f7262eb1486b6f83402c14be90dcddf7d9
commit ef4032f7262eb1486b6f83402c14be90dcddf7d9
Author:     Zack Galbreath <zack.galbreath at kitware.com>
AuthorDate: Wed Feb 25 16:17:23 2015 -0500
Commit:     Zack Galbreath <zack.galbreath at kitware.com>
CommitDate: Wed Feb 25 16:17:23 2015 -0500

    more permissive output for BuildCompileError
    
    This accounts for differences in how native compilers report
    errors and warnings.

diff --git a/Tests/RunCMake/ctest_build/BuildCompileError-stdout.txt b/Tests/RunCMake/ctest_build/BuildCompileError-stdout.txt
index 63215c0..3ecb292 100644
--- a/Tests/RunCMake/ctest_build/BuildCompileError-stdout.txt
+++ b/Tests/RunCMake/ctest_build/BuildCompileError-stdout.txt
@@ -12,5 +12,5 @@ Build project
    Each symbol represents 1024 bytes of output.
    '!' represents an error and '\*' a warning.
     . Size of output: [0-9]+K
-   [1-9] Compiler errors
-   0 Compiler warnings
+   [1-9][0-9]* Compiler errors
+   [0-9]+ Compiler warnings

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

Summary of changes:
 Tests/RunCMake/ctest_build/BuildCompileError-stdout.txt |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)


hooks/post-receive
-- 
CMake