diff options
author | Brad King <brad.king@kitware.com> | 2015-01-24 12:08:12 (GMT) |
---|---|---|
committer | Brad King <brad.king@kitware.com> | 2015-01-24 12:35:44 (GMT) |
commit | 23bf98fc04eccc85f216fdab4166107c3d958d43 (patch) | |
tree | 06a77f401562473870f1fc4a03e074596a532b6f /Tests | |
parent | c99e19a4ac7e6e55345a073b13c36befaa8702d8 (diff) | |
download | CMake-23bf98fc04eccc85f216fdab4166107c3d958d43.zip CMake-23bf98fc04eccc85f216fdab4166107c3d958d43.tar.gz CMake-23bf98fc04eccc85f216fdab4166107c3d958d43.tar.bz2 |
Tests/RunCMake: Honor CMAKE_MAKE_PROGRAM
If tests are using an explicit make program, pass it through to RunCMake
tests so that any that actually do build use the expected tool.
Diffstat (limited to 'Tests')
-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 3a61751..12c1f47 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} |