kolan
/
CMake
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge topic 'fix-11026' 

4a323bd Honor MAKECOMMAND value saved in cache (#11026)
This commit is contained in:
Brad King 2010-09-22 13:53:46 -04:00 committed by CMake Topic Stage
parent dda5bbd7c9 4a323bde0c
commit 8150dc4d2b
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Modules/CTest.cmake
View File

@ -228,8 +228,10 @@ IF(BUILD_TESTING)
ENDIF(NOT BUILDNAME) ENDIF(NOT BUILDNAME)
# the build command # the build command
BUILD_COMMAND(MAKECOMMAND CONFIGURATION "\${CTEST_CONFIGURATION_TYPE}") BUILD_COMMAND(MAKECOMMAND_DEFAULT_VALUE
SET(MAKECOMMAND ${MAKECOMMAND} CACHE STRING "Command to build the project") 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 # the default build configuration the ctest build handler will use
# if there is no -C arg given to ctest: # if there is no -C arg given to ctest: