[Cmake-commits] CMake branch, next, updated. v3.2.2-2305-g1bd5ae8

[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  1bd5ae8f4b73be4b589ce89f8fa6b9d464a6ba3a (commit)
       via  703e76252930429ac39d3ebf456e3e1e688d1982 (commit)
      from  deea4f04274e68c3e9f09f4ace5f4396bf314e11 (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=1bd5ae8f4b73be4b589ce89f8fa6b9d464a6ba3a
commit 1bd5ae8f4b73be4b589ce89f8fa6b9d464a6ba3a
Merge: deea4f0 703e762
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Wed Apr 29 16:16:24 2015 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Wed Apr 29 16:16:24 2015 -0400

    Merge topic 'test-RunCMake-parallel-make' into next
    
    703e7625 Tests: Protect RunCMake tests from MAKEFLAGS in environment (#15542)


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=703e76252930429ac39d3ebf456e3e1e688d1982
commit 703e76252930429ac39d3ebf456e3e1e688d1982
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Wed Apr 29 16:13:50 2015 -0400
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Wed Apr 29 16:14:52 2015 -0400

    Tests: Protect RunCMake tests from MAKEFLAGS in environment (#15542)

diff --git a/Tests/RunCMake/RunCMake.cmake b/Tests/RunCMake/RunCMake.cmake
index b24ae0b..70c0d6c 100644
--- a/Tests/RunCMake/RunCMake.cmake
+++ b/Tests/RunCMake/RunCMake.cmake
@@ -135,3 +135,6 @@ function(run_cmake_command test)
   set(RunCMake_TEST_COMMAND "${ARGN}")
   run_cmake(${test})
 endfunction()
+
+# Protect RunCMake tests from calling environment.
+unset(ENV{MAKEFLAGS})

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

Summary of changes:
 Tests/RunCMake/RunCMake.cmake |    3 +++
 1 file changed, 3 insertions(+)


hooks/post-receive
-- 
CMake