[Cmake-commits] CMake branch, next, updated. v2.8.12.1-6039-g8bce6e5

[Stephen Kelly]

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  8bce6e5a88191ba96feb1c19d7f0afa920b8783c (commit)
       via  24f19317930af04a674ec0cccf760ed9c8f693af (commit)
      from  318067043b68c266d1ad1b304a628bdb75d42f3a (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=8bce6e5a88191ba96feb1c19d7f0afa920b8783c
commit 8bce6e5a88191ba96feb1c19d7f0afa920b8783c
Merge: 3180670 24f1931
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Wed Dec 4 08:58:25 2013 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Wed Dec 4 08:58:25 2013 -0500

    Merge topic 'minor-cleanups' into next
    
    24f1931 Only for makefiles.


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=24f19317930af04a674ec0cccf760ed9c8f693af
commit 24f19317930af04a674ec0cccf760ed9c8f693af
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Wed Dec 4 14:57:45 2013 +0100
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Wed Dec 4 14:57:45 2013 +0100

    Only for makefiles.

diff --git a/Tests/ExportImport/CMakeLists.txt b/Tests/ExportImport/CMakeLists.txt
index f79be19..2df5c8b 100644
--- a/Tests/ExportImport/CMakeLists.txt
+++ b/Tests/ExportImport/CMakeLists.txt
@@ -1,7 +1,7 @@
 cmake_minimum_required (VERSION 2.7.20090711)
 project(ExportImport C CXX)
 
-if (NOT CMAKE_TEST_MAKEPROGRAM)
+if (CMAKE_GENERATOR MATCHES "Makefiles" AND NOT CMAKE_TEST_MAKEPROGRAM)
   message(FATAL_ERROR "You must set CMAKE_TEST_MAKEPROGRAM when running this test")
 endif()
 

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

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


hooks/post-receive
-- 
CMake