[Cmake-commits] CMake branch, next, updated. v3.2.2-2656-g6471255

[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  6471255da43c7827a2149056aafce3ee42debbbd (commit)
       via  1bb3a3a75f2b3dce80cce6fbaaf8eaab28f1ae81 (commit)
      from  0a445a5999fb25bf876f18c022420344f6e70905 (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=6471255da43c7827a2149056aafce3ee42debbbd
commit 6471255da43c7827a2149056aafce3ee42debbbd
Merge: 0a445a5 1bb3a3a
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Fri May 8 16:08:42 2015 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Fri May 8 16:08:42 2015 -0400

    Merge topic 'ctest-no-make-i' into next
    
    1bb3a3a7 fixup! CTest: Stop telling 'make' to ignore errors with -i


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=1bb3a3a75f2b3dce80cce6fbaaf8eaab28f1ae81
commit 1bb3a3a75f2b3dce80cce6fbaaf8eaab28f1ae81
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Fri May 8 16:07:46 2015 -0400
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Fri May 8 16:07:46 2015 -0400

    fixup! CTest: Stop telling 'make' to ignore errors with -i

diff --git a/Tests/RunCMake/ctest_build/RunCMakeTest.cmake b/Tests/RunCMake/ctest_build/RunCMakeTest.cmake
index 1b3bf56..21f9ae7 100644
--- a/Tests/RunCMake/ctest_build/RunCMakeTest.cmake
+++ b/Tests/RunCMake/ctest_build/RunCMakeTest.cmake
@@ -18,7 +18,7 @@ cmake_policy(SET CMP0061 NEW)
 ]])
   run_ctest(BuildFailure)
 
-  if (RunCMake_GENERATOR MATCHES "Make")
+  if (RunCMake_GENERATOR MATCHES "Makefiles")
     set(CASE_TEST_PREFIX_CODE "")
     run_ctest(BuildFailure-CMP0061-OLD)
   endif()

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

Summary of changes:
 Tests/RunCMake/ctest_build/RunCMakeTest.cmake |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)


hooks/post-receive
-- 
CMake