diff options
| author | Brad King <brad.king@kitware.com> | 2015-01-26 15:28:30 (GMT) |
|---|---|---|
| committer | CMake Topic Stage <kwrobot@kitware.com> | 2015-01-26 15:28:30 (GMT) |
| commit | 19e57a48cd1ad562b277c8fb9dc8285ef96acfa0 (patch) | |
| tree | 1b5c103267ca4a18c11f978f794c0c05ba902c38 | |
| parent | 37473374f969f476a7fec87cdc3465c9ab8f99ef (diff) | |
| parent | 23bf98fc04eccc85f216fdab4166107c3d958d43 (diff) | |
| download | CMake-19e57a48cd1ad562b277c8fb9dc8285ef96acfa0.zip CMake-19e57a48cd1ad562b277c8fb9dc8285ef96acfa0.tar.gz CMake-19e57a48cd1ad562b277c8fb9dc8285ef96acfa0.tar.bz2 | |
Merge topic 'tests-RunCMake-make-program'
23bf98fc Tests/RunCMake: Honor CMAKE_MAKE_PROGRAM
| -rw-r--r-- | Tests/RunCMake/CMakeLists.txt | 1 | ||||
| -rw-r--r-- | Tests/RunCMake/RunCMake.cmake | 3 |
2 files changed, 4 insertions, 0 deletions
diff --git a/Tests/RunCMake/CMakeLists.txt b/Tests/RunCMake/CMakeLists.txt index 3767e70..d1457a7 100644 --- a/Tests/RunCMake/CMakeLists.txt +++ b/Tests/RunCMake/CMakeLists.txt @@ -6,6 +6,7 @@ macro(add_RunCMake_test test) -DRunCMake_GENERATOR=${CMAKE_GENERATOR} -DRunCMake_GENERATOR_PLATFORM=${CMAKE_GENERATOR_PLATFORM} -DRunCMake_GENERATOR_TOOLSET=${CMAKE_GENERATOR_TOOLSET} + -DRunCMake_MAKE_PROGRAM=${CMake_TEST_EXPLICIT_MAKE_PROGRAM} -DRunCMake_SOURCE_DIR=${CMAKE_CURRENT_SOURCE_DIR}/${test} -DRunCMake_BINARY_DIR=${CMAKE_CURRENT_BINARY_DIR}/${test} ${${test}_ARGS} diff --git a/Tests/RunCMake/RunCMake.cmake b/Tests/RunCMake/RunCMake.cmake index 1625741..23f2f97 100644 --- a/Tests/RunCMake/RunCMake.cmake +++ b/Tests/RunCMake/RunCMake.cmake @@ -48,6 +48,9 @@ function(run_cmake test) if(APPLE) list(APPEND RunCMake_TEST_OPTIONS -DCMAKE_POLICY_DEFAULT_CMP0025=NEW) endif() + if(RunCMake_MAKE_PROGRAM) + list(APPEND RunCMake_TEST_OPTIONS "-DCMAKE_MAKE_PROGRAM=${RunCMake_MAKE_PROGRAM}") + endif() if(RunCMake_TEST_COMMAND) execute_process( COMMAND ${RunCMake_TEST_COMMAND} |