diff options
| author | Brad King <brad.king@kitware.com> | 2010-09-22 13:53:46 -0400 |
|---|---|---|
| committer | CMake Topic Stage <kwrobot@kitware.com> | 2010-09-22 13:53:46 -0400 |
| commit | 8150dc4d2bc6f273ce3aa06e0f0b24a663c3a60f (patch) | |
| tree | df1816b1e094e4258448bb6186d3d46af8302fa4 /Modules | |
| parent | dda5bbd7c9de31ea5da8463a3ae3a73830e0d7c5 (diff) | |
| parent | 4a323bde0cc23a425ee6589c13bee3b9644942c4 (diff) | |
| download | cmake-8150dc4d2bc6f273ce3aa06e0f0b24a663c3a60f.tar.gz | |
Merge topic 'fix-11026'
4a323bd Honor MAKECOMMAND value saved in cache (#11026)
Diffstat (limited to 'Modules')
| -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 e3157fac2f..bb76ddd25a 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: |