[Cmake-commits] CMake branch, next, updated. v2.8.12.1-6068-ga2bd1d0

[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  a2bd1d02dceb7a6db724db64c7accb60503f1630 (commit)
       via  0a4ef1706171b4b2ea54cf49c4eefd553d6a8ebf (commit)
      from  73f8e7f06aeac0740769d7350bf23b9b418258a0 (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=a2bd1d02dceb7a6db724db64c7accb60503f1630
commit a2bd1d02dceb7a6db724db64c7accb60503f1630
Merge: 73f8e7f 0a4ef17
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Thu Dec 5 12:53:38 2013 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Thu Dec 5 12:53:38 2013 -0500

    Merge topic 'minor-cleanups' into next
    
    0a4ef17 Revert "Tests: Add diagnostic to ExportImport test."


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=0a4ef1706171b4b2ea54cf49c4eefd553d6a8ebf
commit 0a4ef1706171b4b2ea54cf49c4eefd553d6a8ebf
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Thu Dec 5 12:53:02 2013 -0500
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Thu Dec 5 12:53:02 2013 -0500

    Revert "Tests: Add diagnostic to ExportImport test."
    
    This reverts commit 2a66d7e98e31abb532bdf64ea342d4d443784494.
    It will be replaced by a change that makes the test work without
    manually setting CMAKE_TEST_MAKEPROGRAM.

diff --git a/Tests/ExportImport/CMakeLists.txt b/Tests/ExportImport/CMakeLists.txt
index 2df5c8b..8be8d33 100644
--- a/Tests/ExportImport/CMakeLists.txt
+++ b/Tests/ExportImport/CMakeLists.txt
@@ -1,10 +1,6 @@
 cmake_minimum_required (VERSION 2.7.20090711)
 project(ExportImport C CXX)
 
-if (CMAKE_GENERATOR MATCHES "Makefiles" AND NOT CMAKE_TEST_MAKEPROGRAM)
-  message(FATAL_ERROR "You must set CMAKE_TEST_MAKEPROGRAM when running this test")
-endif()
-
 # Wipe out the install tree to make sure the exporter works.
 add_custom_command(
   OUTPUT ${ExportImport_BINARY_DIR}/CleanupProject

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

Summary of changes:
 Tests/ExportImport/CMakeLists.txt |    4 ----
 1 files changed, 0 insertions(+), 4 deletions(-)


hooks/post-receive
-- 
CMake