[Cmake-commits] CMake branch, next, updated. v2.8.12.1-6070-g1b41b61

[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  1b41b61cff7210c569b904c8db8bdba73a3b35b7 (commit)
       via  ef7c11ee31b371bd07bc32991a671da757602213 (commit)
      from  a2bd1d02dceb7a6db724db64c7accb60503f1630 (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=1b41b61cff7210c569b904c8db8bdba73a3b35b7
commit 1b41b61cff7210c569b904c8db8bdba73a3b35b7
Merge: a2bd1d0 ef7c11e
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Thu Dec 5 12:56:17 2013 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Thu Dec 5 12:56:17 2013 -0500

    Merge topic 'cleanup-build-commands' into next
    
    ef7c11e Tests: Fix standalone build of tests with nested projects


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

    Tests: Fix standalone build of tests with nested projects
    
    Since commit fd6076d0 (Tests: Pass CMAKE_MAKE_PROGRAM instead of
    --build-makeprogram, 2013-11-15) the ExportImport, Fortran, and
    MacRuntimePath tests use the value of CMAKE_TEST_MAKEPROGRAM as the
    CMAKE_MAKE_PROGRAM for their nested projects configurations.
    Teach these tests to initialize CMAKE_TEST_MAKEPROGRAM when it is
    not provided, such as when building the tests manually.

diff --git a/Tests/ExportImport/CMakeLists.txt b/Tests/ExportImport/CMakeLists.txt
index 8be8d33..02a0371 100644
--- a/Tests/ExportImport/CMakeLists.txt
+++ b/Tests/ExportImport/CMakeLists.txt
@@ -1,5 +1,8 @@
 cmake_minimum_required (VERSION 2.7.20090711)
 project(ExportImport C CXX)
+if(NOT DEFINED CMAKE_TEST_MAKEPROGRAM AND NOT CMAKE_GENERATOR MATCHES "Visual Studio")
+  set(CMAKE_TEST_MAKEPROGRAM "${CMAKE_MAKE_PROGRAM}")
+endif()
 
 # Wipe out the install tree to make sure the exporter works.
 add_custom_command(
diff --git a/Tests/Fortran/CMakeLists.txt b/Tests/Fortran/CMakeLists.txt
index 8f165ce..adc4308 100644
--- a/Tests/Fortran/CMakeLists.txt
+++ b/Tests/Fortran/CMakeLists.txt
@@ -1,5 +1,9 @@
 cmake_minimum_required (VERSION 2.6)
 project(testf C CXX Fortran)
+if(NOT DEFINED CMAKE_TEST_MAKEPROGRAM AND NOT CMAKE_GENERATOR MATCHES "Visual Studio")
+  set(CMAKE_TEST_MAKEPROGRAM "${CMAKE_MAKE_PROGRAM}")
+endif()
+
 message("CTEST_FULL_OUTPUT ")
 set(CMAKE_VERBOSE_MAKEFILE 1)
 message("ENV_FLAGS = $ENV{FFLAGS}")
diff --git a/Tests/MacRuntimePath/CMakeLists.txt b/Tests/MacRuntimePath/CMakeLists.txt
index a87b41e..5c7b921 100644
--- a/Tests/MacRuntimePath/CMakeLists.txt
+++ b/Tests/MacRuntimePath/CMakeLists.txt
@@ -1,6 +1,8 @@
 cmake_minimum_required (VERSION 2.8)
 project(MacRuntimePath)
-
+if(NOT DEFINED CMAKE_TEST_MAKEPROGRAM AND NOT CMAKE_GENERATOR MATCHES "Visual Studio")
+  set(CMAKE_TEST_MAKEPROGRAM "${CMAKE_MAKE_PROGRAM}")
+endif()
 
 # Wipe out the install tree to make sure the exporter works.
 add_custom_command(

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

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


hooks/post-receive
-- 
CMake