X-Git-Url: https://git.m6w6.name/?a=blobdiff_plain;f=test%2FCMakeLists.txt;h=6f8230fb8aea95c297ff8aeada756361decb2b81;hb=a7e11259b99326ef0d32a1029166aa53546c2708;hp=4538512f6950aa9a62a473ba3d34b06e4915fd06;hpb=541734c10c8be76478a5004bf1282382efe72135;p=m6w6%2Flibmemcached

diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt
index 4538512f..6f8230fb 100644
--- a/test/CMakeLists.txt
+++ b/test/CMakeLists.txt
@@ -2,7 +2,9 @@ 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")
@@ -12,16 +14,14 @@ endif()
 check_decl(pipe2 unistd.h)
 check_decl(SOCK_NONBLOCK sys/socket.h)
 check_decl(SOCK_CLOEXEC sys/socket.h)
-
-check_header(execution)
-
-# TBBConfig only sets TBB_FOUND to FALSE
-set(TBB_FOUND TRUE)
-set(TBB_FIND_RELEASE_ONLY TRUE)
-find_package(TBB)
+check_decl(waitid sys/wait.h)
+if(HAVE_WAITID)
+    check_compiles(HAVE_WAITID_NOWAIT "siginfo_t s; waitid(P_ALL, 0, &s, WNOWAIT|WEXITED);" sys/types.h sys/wait.h)
+endif()
 
 file(GLOB_RECURSE TESTING_SRC RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} *.cpp)
 set(TESTING_ROOT ${CMAKE_CURRENT_BINARY_DIR})
+set(SOURCES_ROOT ${CMAKE_SOURCE_DIR})
 set_source_files_properties(main.cpp PROPERTIES SKIP_UNITY_BUILD_INCLUSION ON)
 configure_file(conf.h.in conf.h @ONLY)
 add_executable(runtests ${TESTING_SRC})
@@ -32,11 +32,14 @@ target_include_directories(runtests PRIVATE
         ${CMAKE_SOURCE_DIR}/src
         ${CMAKE_BINARY_DIR}/src)
 target_link_libraries(runtests PRIVATE libhashkit libmemcachedinternal libmemcachedutil)
-if(TBB_FOUND AND HAVE_EXECUTION)
-    target_link_libraries(runtests PRIVATE TBB::tbb)
-else()
-    set(HAVE_EXECUTION 0)
+
+if(NOT (thread IN_LIST ENABLE_SANITIZERS))
+    check_tbb()
+    if(HAVE_TBB)
+        target_link_libraries(runtests PRIVATE ${LIBTBB})
+    endif()
 endif()
+
 add_dependencies(runtests ${CLIENTS})
 if(HAVE_MEMASLAP)
     add_dependencies(runtests memaslap)