2 files changed, 9 insertions, 5 deletions

diff --git a/CMakeLists.txt b/CMakeLists.txt
index c80f313..71bcfbb 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -3,6 +3,7 @@ cmake_minimum_required(VERSION 2.8.12)
 option(BUILD_MAILDIR "BUILD_MAILDIR" ON)
 option(AVOID_BINDING_REBUILD "AVOID_BINDING_REBUILD" OFF)
 option(CATCH_ERRORS "CATCH_ERRORS" OFF)
+option(ENABLE_MEMCHECK "Build valgrind tests" OFF)
 
 # ECM setup
 find_package(ECM 0.0.10 REQUIRED NO_MODULE)
diff --git a/tests/SinkTest.cmake b/tests/SinkTest.cmake
index e066315..03076e7 100644
--- a/tests/SinkTest.cmake
+++ b/tests/SinkTest.cmake
@@ -1,12 +1,15 @@
 
 
 function(add_memcheck_test name binary)
-    set(memcheck_command "${MEMORYCHECK_COMMAND} ${MEMORYCHECK_COMMAND_OPTIONS}")
-    if (NOT ${memcheck_command})
-        message("MEMORYCHECK_COMMAND not defined.")
+    if (${ENABLE_MEMCHECK})
+        set(memcheck_command "${MEMORYCHECK_COMMAND} ${MEMORYCHECK_COMMAND_OPTIONS}")
+        if (NOT ${memcheck_command})
+            message("MEMORYCHECK_COMMAND not defined.")
+        else()
+            separate_arguments(memcheck_command)
+            add_test(memcheck_${name} ${memcheck_command} ./${binary} ${ARGN})
+        endif()
     endif()
-    separate_arguments(memcheck_command)
-    add_test(memcheck_${name} ${memcheck_command} ./${binary} ${ARGN})
 endfunction(add_memcheck_test)
 
 macro(auto_tests)