X-Git-Url: https://git.m6w6.name/?a=blobdiff_plain;ds=sidebyside;f=test%2FCMakeLists.txt;h=449223f0efd3fb62379cf48f7a8e5d24551e9733;hb=6566141841926721ffeb620d29d17cbd3857fdc7;hp=ebb39afe84a755f11b8da79f8ca69ac91b1f7f2d;hpb=36c2351bfeb343f4d6da922cdee58f4bcdcd7e08;p=awesomized%2Flibmemcached

diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt
index ebb39afe..449223f0 100644
--- a/test/CMakeLists.txt
+++ b/test/CMakeLists.txt
@@ -2,7 +2,14 @@ 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)
@@ -20,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*")