[Cmake-commits] CMake branch, next, updated. v3.3.0-2148-gc7fa36d

[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  c7fa36d3ea7da82bfdfc147d985303b0b5a3a6b7 (commit)
       via  c180f0cbc224bf7f3fe9bcfdeea2d3c712c61084 (commit)
       via  586b2e5e3633db1e1749dc2bdd69f6240b714139 (commit)
      from  c25a6f43e2f8b1a4f632ac37cc614c8ca6690b86 (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=c7fa36d3ea7da82bfdfc147d985303b0b5a3a6b7
commit c7fa36d3ea7da82bfdfc147d985303b0b5a3a6b7
Merge: c25a6f4 c180f0c
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Tue Aug 11 10:26:36 2015 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Tue Aug 11 10:26:36 2015 -0400

    Merge topic 'tests-use-CMAKE_MAKE_PROGRAM' into next
    
    c180f0cb Tests: Fix CMAKE_MAKE_PROGRAM selection in FortranC.Flags test
    586b2e5e Tests: Fix CMAKE_MAKE_PROGRAM selection in CMakeOnly tests


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=c180f0cbc224bf7f3fe9bcfdeea2d3c712c61084
commit c180f0cbc224bf7f3fe9bcfdeea2d3c712c61084
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Mon Aug 10 14:09:22 2015 -0400
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Tue Aug 11 10:18:05 2015 -0400

    Tests: Fix CMAKE_MAKE_PROGRAM selection in FortranC.Flags test
    
    Use the explicitly-tested make program, if any.

diff --git a/Tests/FortranC/Flags.cmake.in b/Tests/FortranC/Flags.cmake.in
index 2300fc6..cf361a5 100644
--- a/Tests/FortranC/Flags.cmake.in
+++ b/Tests/FortranC/Flags.cmake.in
@@ -12,11 +12,17 @@ configure_file("${src}/test_opt.sh.in" "${bld}/fc.sh" @ONLY)
 set(ID)
 set(COMMAND)
 
+set(make_program "@CMake_TEST_EXPLICIT_MAKE_PROGRAM@")
+if(make_program)
+  set(maybe_make_program "-DCMAKE_MAKE_PROGRAM=${make_program}")
+endif()
+
 execute_process(
   WORKING_DIRECTORY "${bld}"
   COMMAND ${CMAKE_COMMAND} "${src}" -G "@CMAKE_GENERATOR@"
                            -A "@CMAKE_GENERATOR_PLATFORM@"
                            -T "@CMAKE_GENERATOR_TOOLSET@"
+                           ${maybe_make_program}
                            "-DFortranC_TEST_FLAGS=1"
                            "-DCMAKE_C_COMPILER=${bld}/cc.sh"
                            "-DCMAKE_C_FLAGS:STRING=@CMAKE_C_FLAGS@"

http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=586b2e5e3633db1e1749dc2bdd69f6240b714139
commit 586b2e5e3633db1e1749dc2bdd69f6240b714139
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Mon Aug 10 14:06:09 2015 -0400
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Tue Aug 11 10:18:04 2015 -0400

    Tests: Fix CMAKE_MAKE_PROGRAM selection in CMakeOnly tests
    
    Use the explicitly-tested make program, if any.

diff --git a/Tests/CMakeOnly/Test.cmake.in b/Tests/CMakeOnly/Test.cmake.in
index 8d3258b..0ae8af1 100644
--- a/Tests/CMakeOnly/Test.cmake.in
+++ b/Tests/CMakeOnly/Test.cmake.in
@@ -2,6 +2,11 @@ if (NOT TEST_SOURCE)
   set(TEST_SOURCE "${TEST}")
 endif ()
 
+set(make_program "@CMake_TEST_EXPLICIT_MAKE_PROGRAM@")
+if(make_program)
+  set(maybe_make_program "-DCMAKE_MAKE_PROGRAM=${make_program}")
+endif()
+
 set(source_dir "@CMAKE_CURRENT_SOURCE_DIR@/${TEST_SOURCE}")
 set(binary_dir "@CMAKE_CURRENT_BINARY_DIR@/${TEST}-build")
 file(REMOVE_RECURSE "${binary_dir}")
@@ -11,6 +16,7 @@ execute_process(
   "${source_dir}" -G "@CMAKE_GENERATOR@"
   -A "@CMAKE_GENERATOR_PLATFORM@"
   -T "@CMAKE_GENERATOR_TOOLSET@"
+  ${maybe_make_program}
   WORKING_DIRECTORY "${binary_dir}"
   RESULT_VARIABLE result
   )

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

Summary of changes:
 Tests/CMakeOnly/Test.cmake.in |    6 ++++++
 Tests/FortranC/Flags.cmake.in |    6 ++++++
 2 files changed, 12 insertions(+)


hooks/post-receive
-- 
CMake