projects
/
m6w6
/
libmemcached
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
|
github
raw
|
inline
| side by side
bin: move memaslap to contrib
[m6w6/libmemcached]
/
CMake
/
_Include.cmake
diff --git
a/CMake/_Include.cmake
b/CMake/_Include.cmake
index 8a33f964ebe9791fdea56cd997c08460cd94a3d8..67917c8e10b6720c83ae4bf5586133fbeb7fd013 100644
(file)
--- a/
CMake/_Include.cmake
+++ b/
CMake/_Include.cmake
@@
-6,7
+6,7
@@
endif()
include(GNUInstallDirs)
include(CMakePackageConfigHelpers)
include(GNUInstallDirs)
include(CMakePackageConfigHelpers)
-if(CMAKE_HOST_SYSTEM_NAME
STREQUAL "Free
BSD")
+if(CMAKE_HOST_SYSTEM_NAME
MATCHES "
BSD")
find_program(PKGCONF pkgconf)
if(PKGCONF)
set(PKG_CONFIG_EXECUTABLE ${PKGCONF})
find_program(PKGCONF pkgconf)
if(PKGCONF)
set(PKG_CONFIG_EXECUTABLE ${PKGCONF})
@@
-38,8
+38,9
@@
check_debug()
if(ENABLE_MEMASLAP)
check_stdatomic()
check_dependency(LIBEVENT event event.h)
if(ENABLE_MEMASLAP)
check_stdatomic()
check_dependency(LIBEVENT event event.h)
+ check_dependency(LIBMATH m math.h)
check_decl(getline stdio.h)
check_decl(getline stdio.h)
- if(LIBEVENT AND HAVE_C_STDATOMIC)
+ if(
HAVE_
LIBEVENT AND HAVE_C_STDATOMIC)
set(HAVE_MEMASLAP 1)
endif()
endif()
set(HAVE_MEMASLAP 1)
endif()
endif()
@@
-61,13
+62,12
@@
if(BUILD_TESTING)
find_package(Memcached)
set(MEMCACHED_BINARY ${MEMCACHED_EXECUTABLE})
endif()
find_package(Memcached)
set(MEMCACHED_BINARY ${MEMCACHED_EXECUTABLE})
endif()
- check_dependency(LIBUUID uuid uuid/uuid.h)
endif()
## sasl
if(ENABLE_SASL)
check_dependency(LIBSASL sasl2 sasl/sasl.h)
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()
set(LIBMEMCACHED_WITH_SASL_SUPPORT 1)
endif()
endif()
@@
-129,6
+129,11
@@
check_decl(abi::__cxa_demangle cxxabi.h)
find_package(Backtrace)
if(Backtrace_FOUND)
set(HAVE_BACKTRACE 1)
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)
endif()
check_type(in_port_t netinet/in.h)