[Cmake-commits] CMake branch, next, updated. v2.8.2-894-g81978d7

[David Cole]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "CMake".

The branch, next has been updated
       via  81978d71437d863ebe9834cb3cea77c846fde17d (commit)
       via  4a323bde0cc23a425ee6589c13bee3b9644942c4 (commit)
      from  31e6b9e72e5450c5da3625e50984417d9c0b06ac (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=81978d71437d863ebe9834cb3cea77c846fde17d
commit 81978d71437d863ebe9834cb3cea77c846fde17d
Merge: 31e6b9e 4a323bd
Author:     David Cole <david.cole at kitware.com>
AuthorDate: Tue Sep 21 22:11:13 2010 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Tue Sep 21 22:11:13 2010 -0400

    Merge topic 'fix-11026' into next
    
    4a323bd Honor MAKECOMMAND value saved in cache (#11026)


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=4a323bde0cc23a425ee6589c13bee3b9644942c4
commit 4a323bde0cc23a425ee6589c13bee3b9644942c4
Author:     David Cole <david.cole at kitware.com>
AuthorDate: Tue Sep 21 21:46:52 2010 -0400
Commit:     David Cole <david.cole at kitware.com>
CommitDate: Tue Sep 21 21:51:40 2010 -0400

    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.

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:

-----------------------------------------------------------------------

Summary of changes:
 Modules/CTest.cmake |    6 ++++--
 1 files changed, 4 insertions(+), 2 deletions(-)


hooks/post-receive
-- 
CMake