[Cmake-commits] CMake branch, next, updated. v2.8.12.1-6048-g441cd93

[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  441cd93e0f6858f278c12e8bdeb3f95da2bc7a7d (commit)
       via  2a66d7e98e31abb532bdf64ea342d4d443784494 (commit)
      from  cef231f3b8d5cadf52d6d4bf0ecdbe240c928d9b (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=441cd93e0f6858f278c12e8bdeb3f95da2bc7a7d
commit 441cd93e0f6858f278c12e8bdeb3f95da2bc7a7d
Merge: cef231f 2a66d7e
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Wed Dec 4 12:30:23 2013 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Wed Dec 4 12:30:23 2013 -0500

    Merge topic 'minor-cleanups' into next
    
    2a66d7e Tests: Add diagnostic to ExportImport test.


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=2a66d7e98e31abb532bdf64ea342d4d443784494
commit 2a66d7e98e31abb532bdf64ea342d4d443784494
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Wed Dec 4 13:48:27 2013 +0100
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Wed Dec 4 18:29:53 2013 +0100

    Tests: Add diagnostic to ExportImport test.
    
    The error message is otherwise confusing:
    
     $ make
     makeobj[0]: Entering directory `/home/stephen/dev/src/cmake/Tests/ExportImport/build'
     [ 25%] Generating CleanupProject
     [ 25%] Built target CleanupTarget
     [ 50%] Generating ExportProject
     loading initial cache file /home/stephen/dev/src/cmake/Tests/ExportImport/build/InitialCache.cmake
     Internal cmake changing into directory: /home/stephen/dev/src/cmake/Tests/ExportImport/build/Export
     Error: cmake execution failed
     CMake Error: CMake was unable to find a build program corresponding to "Unix Makefiles".  CMAKE_MAKE_PROGRAM is not set.  You probably need to select a different build tool.
     CMake Error: Error required internal CMake variable not set, cmake may be not be built correctly.

diff --git a/Tests/ExportImport/CMakeLists.txt b/Tests/ExportImport/CMakeLists.txt
index 8be8d33..2df5c8b 100644
--- a/Tests/ExportImport/CMakeLists.txt
+++ b/Tests/ExportImport/CMakeLists.txt
@@ -1,6 +1,10 @@
 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:


hooks/post-receive
-- 
CMake