testing

[awesomized/libmemcached] / test / CMakeLists.txt

diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt
index 2339a55b73cc81b33d5db74cb749f79f481b0e38..d364ac313b4d07ebf14f8a7aaa25984e7e762b5c 100644 (file)
--- a/test/CMakeLists.txt
+++ b/test/CMakeLists.txt
@@ -5,11 +5,8 @@ endif()
 include(CMake/Catch.cmake)
 
 if(NOT MEMCACHED_BINARY)
-    find_program(MEMCACHED_BINARY memcached DOC "memcached binary")
-    if(NOT MEMCACHED_BINARY)
-        message(SEND_ERROR "Could not find memcached(1) binary")
-        set(ENV{INVALID_CONFIGURATION} 1)
-    endif()
+    message(SEND_ERROR "Could not find memcached(1) binary")
+    set(ENV{INVALID_CONFIGURATION} 1)
 endif()
 
 
@@ -17,10 +14,6 @@ check_decl(pipe2 unistd.h)
 check_decl(SOCK_NONBLOCK sys/socket.h)
 check_decl(SOCK_CLOEXEC sys/socket.h)
 
-if(ENABLE_MEMASLAP AND LIBEVENT AND HAVE_C_STDATOMIC)
-    set(HAVE_MEMASLAP 1)
-endif()
-
 file(GLOB_RECURSE TESTING_SRC RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} *.cpp)
 set(TESTING_ROOT ${CMAKE_CURRENT_BINARY_DIR})
 set_source_files_properties(main.cpp PROPERTIES SKIP_UNITY_BUILD_INCLUSION ON)
@@ -34,6 +27,9 @@ target_include_directories(runtests PRIVATE
         ${CMAKE_BINARY_DIR}/src)
 target_link_libraries(runtests PRIVATE libhashkit libmemcachedinternal libmemcachedutil)
 add_dependencies(runtests ${CLIENTS})
+if(HAVE_MEMASLAP)
+    add_dependencies(runtests memaslap)
+endif()
 
 catch_discover_tests(runtests
         TEST_SPEC "lib*")