projects
/
awesomized
/
libmemcached
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
|
github
raw
|
inline
| side by side
prepare v1.1.4
[awesomized/libmemcached]
/
test
/
CMakeLists.txt
diff --git
a/test/CMakeLists.txt
b/test/CMakeLists.txt
index 523db5be19219081582570fdddbbc472ce4913d0..67cd47c69feef602275422af603ea0e8139f4d68 100644
(file)
--- a/
test/CMakeLists.txt
+++ b/
test/CMakeLists.txt
@@
-12,8
+12,6
@@
configure_define_string(LIBMEMCACHED_WITH_SASL_CONF)
list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/CMake")
include(Catch)
list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/CMake")
include(Catch)
-add_definitions(-D_GNU_SOURCE)
-set(CMAKE_REQUIRED_DEFINITIONS -D_GNU_SOURCE)
check_symbol(pipe2 unistd.h)
check_symbol(SOCK_NONBLOCK sys/socket.h)
check_symbol(SOCK_CLOEXEC sys/socket.h)
check_symbol(pipe2 unistd.h)
check_symbol(SOCK_NONBLOCK sys/socket.h)
check_symbol(SOCK_CLOEXEC sys/socket.h)
@@
-46,6
+44,7
@@
if(NOT MEMCACHED_BINARY)
endif()
add_executable(timeout timeout.c)
endif()
add_executable(timeout timeout.c)
+target_include_directories(timeout PRIVATE ${CMAKE_BINARY_DIR})
file(GLOB_RECURSE TESTING_SRC RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} *.cpp)
set(TESTING_ROOT "${CMAKE_CURRENT_BINARY_DIR}")
file(GLOB_RECURSE TESTING_SRC RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} *.cpp)
set(TESTING_ROOT "${CMAKE_CURRENT_BINARY_DIR}")
@@
-71,7
+70,7
@@
endif()
add_dependencies(runtests ${CLIENTS} timeout)
if(TARGET memaslap)
configure_set(HAVE_MEMASLAP 1)
add_dependencies(runtests ${CLIENTS} timeout)
if(TARGET memaslap)
configure_set(HAVE_MEMASLAP 1)
- add_dependencies(runtests
mem
aslap)
+ add_dependencies(runtests aslap)
endif()
configure_file(${CONFIGURE_FILE_IN} ${CONFIGURE_FILE_OUT} @ONLY)
endif()
configure_file(${CONFIGURE_FILE_IN} ${CONFIGURE_FILE_OUT} @ONLY)