diff options
| author | David Cole <david.cole@kitware.com> | 2010-09-22 01:46:52 (GMT) |
|---|---|---|
| committer | David Cole <david.cole@kitware.com> | 2010-09-22 01:51:40 (GMT) |
| commit | 4a323bde0cc23a425ee6589c13bee3b9644942c4 (patch) | |
| tree | 59935b382ac36d86748d0255b3ac10eb650b02e8 /Modules/CTest.cmake | |
| parent | 5970c0f947ecc94ec4b1c0ca1d7e90d80124647c (diff) | |
| download | CMake-4a323bde0cc23a425ee6589c13bee3b9644942c4.zip CMake-4a323bde0cc23a425ee6589c13bee3b9644942c4.tar.gz CMake-4a323bde0cc23a425ee6589c13bee3b9644942c4.tar.bz2 | |
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.
Diffstat (limited to 'Modules/CTest.cmake')
| -rw-r--r-- | Modules/CTest.cmake | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/Modules/CTest.cmake b/Modules/CTest.cmake index e3157fa..bb76ddd 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: |