X-Git-Url: https://git.m6w6.name/?a=blobdiff_plain;f=test%2FCMakeLists.txt;h=449223f0efd3fb62379cf48f7a8e5d24551e9733;hb=a08ebebc7f7f2d86eb13151fb230cbfcd17dc090;hp=9ea8cd2ca363a6e404553cbd322be66b18420849;hpb=a93908cc9c40eef179d33a89fc011e2e3c54c438;p=awesomized%2Flibmemcached

diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt
index 9ea8cd2c..449223f0 100644
--- a/test/CMakeLists.txt
+++ b/test/CMakeLists.txt
@@ -2,16 +2,19 @@ if(NOT BUILD_TESTING OR NOT CMAKE_PROJECT_NAME STREQUAL PROJECT_NAME)
     return()
 endif()
 
-include(CMake/Catch.cmake)
+list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/CMake")
+include(Catch)
+include(CheckTbb)
+
+if(NOT MEMCACHED_BINARY)
+    message(SEND_ERROR "Could not find memcached(1) binary")
+    set(ENV{INVALID_CONFIGURATION} 1)
+endif()
 
 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)
@@ -24,7 +27,16 @@ target_include_directories(runtests PRIVATE
         ${CMAKE_SOURCE_DIR}/src
         ${CMAKE_BINARY_DIR}/src)
 target_link_libraries(runtests PRIVATE libhashkit libmemcachedinternal libmemcachedutil)
+
+check_tbb()
+if(HAVE_TBB)
+    target_link_libraries(runtests PRIVATE ${LIBTBB})
+endif()
+
 add_dependencies(runtests ${CLIENTS})
+if(HAVE_MEMASLAP)
+    add_dependencies(runtests memaslap)
+endif()
 
 catch_discover_tests(runtests
         TEST_SPEC "lib*")