bin/contrib/memaslap: attempt to fix atomics detection

[m6w6/libmemcached] / CMake / _Include.cmake

diff --git a/CMake/_Include.cmake b/CMake/_Include.cmake
index 7067ef46fc4cea2ab5a5b6ed57c0316aba713fd3..b4f2dbd182db04d672b17c2fbad9094ed5576755 100644 (file)
--- a/CMake/_Include.cmake
+++ b/CMake/_Include.cmake
@@ -6,7 +6,7 @@ endif()
 include(GNUInstallDirs)
 include(CMakePackageConfigHelpers)
 
-if(CMAKE_HOST_SYSTEM_NAME STREQUAL "FreeBSD")
+if(CMAKE_HOST_SYSTEM_NAME MATCHES "BSD")
     find_program(PKGCONF pkgconf)
     if(PKGCONF)
         set(PKG_CONFIG_EXECUTABLE ${PKGCONF})
@@ -25,7 +25,9 @@ include(CheckDependency)
 include(CheckHeader)
 include(CheckCompiles)
 include(CheckType)
-include(CheckStdatomic)
+include(CheckAtomics)
+include(TestBigEndian)
+include(CheckByteswap)
 
 # configuration
 
@@ -34,9 +36,12 @@ check_debug()
 
 ## memaslap
 if(ENABLE_MEMASLAP)
-    check_stdatomic()
+    check_atomics()
     check_dependency(LIBEVENT event event.h)
     check_decl(getline stdio.h)
+    if(HAVE_LIBEVENT AND HAVE_C_STDATOMIC)
+        set(HAVE_MEMASLAP 1)
+    endif()
 endif()
 
 ## dtrace
@@ -52,13 +57,16 @@ endif()
 
 ## uuid
 if(BUILD_TESTING)
-    check_dependency(LIBUUID uuid uuid/uuid.h)
+    if(NOT MEMCACHED_BINARY)
+        find_package(Memcached)
+        set(MEMCACHED_BINARY ${MEMCACHED_EXECUTABLE})
+    endif()
 endif()
 
 ## sasl
 if(ENABLE_SASL)
     check_dependency(LIBSASL sasl2 sasl/sasl.h)
-    if(LIBSASL)
+    if(HAVE_LIBSASL)
         set(LIBMEMCACHED_WITH_SASL_SUPPORT 1)
     endif()
 endif()
@@ -76,8 +84,8 @@ endif()
 
 # system checks
 
-include(TestBigEndian)
 test_big_endian(WORDS_BIGENDIAN)
+check_byteswap()
 
 check_header(alloca.h)
 check_header(arpa/inet.h)
@@ -107,11 +115,12 @@ check_decl(htonll arpa/inet.h)
 check_decl(MSG_DONTWAIT sys/socket.h)
 check_decl(MSG_MORE sys/socket.h)
 check_decl(MSG_NOSIGNAL sys/socket.h)
-check_decl(rcvtimeo sys/socket.h)
-check_decl(sndtimeo sys/socket.h)
+check_decl(SO_RCVTIMEO sys/socket.h)
+check_decl(SO_SNDTIMEO sys/socket.h)
 check_decl(setenv stdlib.h)
 check_decl(strerror string.h)
 check_decl(strerror_r string.h)
+
 check_compiles(HAVE_STRERROR_R_CHAR_P "char x, y = *strerror_r(0,&x,1);" string.h)
 
 check_decl(abi::__cxa_demangle cxxabi.h)
@@ -119,9 +128,15 @@ check_decl(abi::__cxa_demangle cxxabi.h)
 find_package(Backtrace)
 if(Backtrace_FOUND)
     set(HAVE_BACKTRACE 1)
+    set(BACKTRACE BACKTRACE)
+    add_library(BACKTRACE INTERFACE IMPORTED)
+    set_target_properties(BACKTRACE PROPERTIES
+            INTERFACE_LINK_LIBRARIES "${Backtrace_LIBRARIES}"
+            INTERFACE_INCLUDE_DIRECTORIES "${Backtrace_INCLUDE_DIR}")
 endif()
 
 check_type(in_port_t netinet/in.h)
 
 check_header(cstdint)
 check_header(cinttypes)
+check_header(inttypes.h)