From 4a323bde0cc23a425ee6589c13bee3b9644942c4 Mon Sep 17 00:00:00 2001 From: David Cole Date: Tue, 21 Sep 2010 21:46:52 -0400 Subject: [PATCH] Honor MAKECOMMAND value saved in cache (#11026) Use a separate variable to pass to the BUILD_COMMAND call and then use set(CACHE) to transfer that to MAKECOMMAND. That way, if MAKECOMMAND is in the cache already, it is left untouched. Fixes regression introduced in commit 0b38bb4c with the fix for bug #2336. Thanks to Evgeniy P for the patch. --- Modules/CTest.cmake | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/Modules/CTest.cmake b/Modules/CTest.cmake index e3157fac2..bb76ddd25 100644 --- a/Modules/CTest.cmake +++ b/Modules/CTest.cmake @@ -228,8 +228,10 @@ IF(BUILD_TESTING) ENDIF(NOT BUILDNAME) # the build command - BUILD_COMMAND(MAKECOMMAND CONFIGURATION "\${CTEST_CONFIGURATION_TYPE}") - SET(MAKECOMMAND ${MAKECOMMAND} CACHE STRING "Command to build the project") + BUILD_COMMAND(MAKECOMMAND_DEFAULT_VALUE + CONFIGURATION "\${CTEST_CONFIGURATION_TYPE}") + SET(MAKECOMMAND ${MAKECOMMAND_DEFAULT_VALUE} + CACHE STRING "Command to build the project") # the default build configuration the ctest build handler will use # if there is no -C arg given to ctest: