2 files changed, 11 insertions, 7 deletions

diff --git a/CMakeLists.txt b/CMakeLists.txt
index cef0c3c..5ee08ae 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -36,8 +36,13 @@ find_package(FlatBuffers REQUIRED 1.4.0)
 find_package(KAsync REQUIRED 0.1.2)
 find_package(LMDB REQUIRED 0.9)
 
-find_program(MEMORYCHECK_COMMAND valgrind)
-set(MEMORYCHECK_COMMAND_OPTIONS "--trace-children=yes --leak-check=full")
+if (${ENABLE_MEMCHECK})
+    find_program(MEMORYCHECK_COMMAND valgrind)
+    if(NOT MEMORYCHECK_COMMAND)
+        message(FATAL_ERROR "valgrind not found!")
+    endif()
+    set(MEMORYCHECK_COMMAND_OPTIONS "--trace-children=yes --leak-check=full")
+endif()
 
 #Clang-format support
 add_custom_command(
diff --git a/tests/SinkTest.cmake b/tests/SinkTest.cmake
index 4eb8f43..d0cda8d 100644
--- a/tests/SinkTest.cmake
+++ b/tests/SinkTest.cmake
@@ -3,12 +3,11 @@
 function(add_memcheck_test name binary)
     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})
+        if (NOT memcheck_command)
+            message(FATAL_ERROR "memcheck_command not defined. ${memcheck_command}")
         endif()
+        separate_arguments(memcheck_command)
+        add_test(memcheck_${name} ${memcheck_command} ./${binary} ${ARGN})
     endif()
 endfunction(add_memcheck_test)