[Cmake-commits] CMake branch, next, updated. v2.8.3-1508-g5a42c3e

[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  5a42c3e1c56db691c2eefa3d4d375b2fd6906c2c (commit)
       via  2b082aa353865eb3f2c47abe5aa79cbb837c1a05 (commit)
      from  b706dcfc2636394bedc768b9ad9114efb78665fc (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=5a42c3e1c56db691c2eefa3d4d375b2fd6906c2c
commit 5a42c3e1c56db691c2eefa3d4d375b2fd6906c2c
Merge: b706dcf 2b082aa
Author:     David Cole <david.cole at kitware.com>
AuthorDate: Thu Jan 27 18:39:31 2011 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Thu Jan 27 18:39:31 2011 -0500

    Merge topic 'avoid-purify-in-CTestTest2' into next
    
    2b082aa CTestTest2: Avoid running purify unless requested


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=2b082aa353865eb3f2c47abe5aa79cbb837c1a05
commit 2b082aa353865eb3f2c47abe5aa79cbb837c1a05
Author:     David Cole <david.cole at kitware.com>
AuthorDate: Thu Jan 27 14:36:14 2011 -0500
Commit:     David Cole <david.cole at kitware.com>
CommitDate: Thu Jan 27 14:36:14 2011 -0500

    CTestTest2: Avoid running purify unless requested

diff --git a/Tests/CTestTest2/test.cmake.in b/Tests/CTestTest2/test.cmake.in
index f6ec198..b58b639 100644
--- a/Tests/CTestTest2/test.cmake.in
+++ b/Tests/CTestTest2/test.cmake.in
@@ -15,13 +15,12 @@ SET(CTEST_MEMORYCHECK_SUPPRESSIONS_FILE "@MEMORYCHECK_SUPPRESSIONS_FILE@")
 SET(CTEST_MEMORYCHECK_COMMAND_OPTIONS   "@MEMORYCHECK_COMMAND_OPTIONS@")
 SET(CTEST_COVERAGE_COMMAND              "@COVERAGE_COMMAND@")
 SET(CTEST_NOTES_FILES                   "${CTEST_SCRIPT_DIRECTORY}/${CTEST_SCRIPT_NAME}")
-# for unix purify has to be used as a linker, and
-# will not work with ctest.  So disable it so
-# that it is not attempted.
-IF(UNIX)
-  IF("${CTEST_MEMORYCHECK_COMMAND}" MATCHES purify)
-    SET(CTEST_MEMORYCHECK_COMMAND)
-  ENDIF()
+
+# By default, CTESTTEST2_USE_PURIFY is not defined. If you want to run purify
+# on CTestTest2, set CTESTTEST2_USE_PURIFY to ON in CMake's cache.
+SET(CTESTTEST2_USE_PURIFY @CTESTTEST2_USE_PURIFY@)
+IF("${CTEST_MEMORYCHECK_COMMAND}" MATCHES purify AND NOT CTESTTEST2_USE_PURIFY)
+  SET(CTEST_MEMORYCHECK_COMMAND)
 ENDIF()
 
 #CTEST_EMPTY_BINARY_DIRECTORY(${CTEST_BINARY_DIRECTORY})

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

Summary of changes:
 Tests/CTestTest2/test.cmake.in |   13 ++++++-------
 1 files changed, 6 insertions(+), 7 deletions(-)


hooks/post-receive
-- 
CMake