summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBrad King <brad.king@kitware.com>2011-01-28 19:17:44 (GMT)
committerCMake Topic Stage <kwrobot@kitware.com>2011-01-28 19:17:44 (GMT)
commitba718fb8275e98c8404c6362f8ac675165bbfef1 (patch)
treebcc4b9d312045d7aa9a810504b9822ff0d91de7c
parentaa21763e0caec11d7b6df0eac5fe828eb95059d1 (diff)
parent2b082aa353865eb3f2c47abe5aa79cbb837c1a05 (diff)
downloadCMake-ba718fb8275e98c8404c6362f8ac675165bbfef1.zip
CMake-ba718fb8275e98c8404c6362f8ac675165bbfef1.tar.gz
CMake-ba718fb8275e98c8404c6362f8ac675165bbfef1.tar.bz2
Merge topic 'avoid-purify-in-CTestTest2'
2b082aa CTestTest2: Avoid running purify unless requested
-rw-r--r--Tests/CTestTest2/test.cmake.in13
1 files changed, 6 insertions, 7 deletions
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})