From f85ed37cf19541cc6f89980ee91c446a0e47d80c Mon Sep 17 00:00:00 2001 From: David Nadlinger Date: Wed, 13 Feb 2013 16:04:01 +0100 Subject: [PATCH] Revert "Use CMake-detected make program." CMAKE_MAKE_PROGRAM isn't always (GNU) make, but refers to the "make" equivalent of the target generator, for example the "ninja" executable if the Ninja generator is used. Using find_program or something similar would probably still be a good idea. This reverts commit 5a6176316a5531077b6402970250998a366c0bb6. --- tests/d2/CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/d2/CMakeLists.txt b/tests/d2/CMakeLists.txt index 3cfe321f..2b3de0de 100644 --- a/tests/d2/CMakeLists.txt +++ b/tests/d2/CMakeLists.txt @@ -19,7 +19,7 @@ function(add_testsuite config_name dflags model) # testsuite build system provides no way to run the test cases with a # given set of flags without trying all combinations of them. add_test(NAME ${name} - COMMAND ${CMAKE_MAKE_PROGRAM} -C ${PROJECT_SOURCE_DIR}/tests/d2/dmd-testsuite RESULTS_DIR=${outdir} DMD=${ldmd_path} DFLAGS=${dflags} MODEL=${model} quick + COMMAND make -C ${PROJECT_SOURCE_DIR}/tests/d2/dmd-testsuite RESULTS_DIR=${outdir} DMD=${ldmd_path} DFLAGS=${dflags} MODEL=${model} quick ) set_tests_properties(${name} PROPERTIES DEPENDS ${name}_clean) endfunction()