[Cmake-commits] CMake branch, master, updated. 2e25606a48f1867a5e328216b8f4a23f43ce329b

[cmake-commits at cmake.org]

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, master has been updated
       via  2e25606a48f1867a5e328216b8f4a23f43ce329b (commit)
      from  83b00e00e2b6d3ffa5f752922b3da36372c5342f (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=2e25606a48f1867a5e328216b8f4a23f43ce329b
commit 2e25606a48f1867a5e328216b8f4a23f43ce329b
Author: Bill Hoffman <bill.hoffman at kitware.com>
Date:   Tue May 11 09:30:41 2010 -0400

    Disable purify on unix, as it works differently and ctest can't use it.

diff --git a/Tests/CTestTest2/test.cmake.in b/Tests/CTestTest2/test.cmake.in
index cccd8c1..f6ec198 100644
--- a/Tests/CTestTest2/test.cmake.in
+++ b/Tests/CTestTest2/test.cmake.in
@@ -15,6 +15,14 @@ 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()
+ENDIF()
 
 #CTEST_EMPTY_BINARY_DIRECTORY(${CTEST_BINARY_DIRECTORY})
 
diff --git a/Tests/CTestTest3/test.cmake.in b/Tests/CTestTest3/test.cmake.in
index 1cf5a88..1e8ea50 100644
--- a/Tests/CTestTest3/test.cmake.in
+++ b/Tests/CTestTest3/test.cmake.in
@@ -25,6 +25,14 @@ SET(CTEST_BUILD_CONFIGURATION           "$ENV{CMAKE_CONFIG_TYPE}")
 SET(CTEST_MEMORYCHECK_COMMAND           "@MEMORYCHECK_COMMAND@")
 SET(CTEST_MEMORYCHECK_SUPPRESSIONS_FILE "@MEMORYCHECK_SUPPRESSIONS_FILE@")
 SET(CTEST_MEMORYCHECK_COMMAND_OPTIONS   "@MEMORYCHECK_COMMAND_OPTIONS@")
+# 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()
+ENDIF()
 SET(CTEST_COVERAGE_COMMAND              "@COVERAGE_COMMAND@")
 SET(CTEST_NOTES_FILES                   "${CTEST_SCRIPT_DIRECTORY}/${CTEST_SCRIPT_NAME}")
 SET(CTEST_CHECKOUT_COMMAND              "\"${CTEST_UPDATE_COMMAND}\" -q -z3 \"-d:pserver:anoncvs at www.cmake.org:/cvsroot/KWSys\" co -r CTest-Testing-Tag KWSys")

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

Summary of changes:
 Tests/CTestTest2/test.cmake.in |    8 ++++++++
 Tests/CTestTest3/test.cmake.in |    8 ++++++++
 2 files changed, 16 insertions(+), 0 deletions(-)


hooks/post-receive
-- 
CMake