projects
/
awesomized
/
libmemcached
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
|
github
raw
|
inline
| side by side
travis: try to fix ubsan for clang-old
[awesomized/libmemcached]
/
CMake
/
_Include.cmake
diff --git
a/CMake/_Include.cmake
b/CMake/_Include.cmake
index 1c5b89ffab55ed7f32aea92f15c32cf08c5a39e2..a6b5463c1a1b201be45a823df8a0f5d1884e0cef 100644
(file)
--- a/
CMake/_Include.cmake
+++ b/
CMake/_Include.cmake
@@
-1,12
+1,13
@@
-set(CMAKE_MODULE_PATH ${CMAKE_SOURCE_DIR}/CMake)
-
-set(THREADS_PREFER_PTHREAD_FLAG ON)
# globals
# globals
-include(CTest)
+if(CMAKE_PROJECT_NAME STREQUAL PROJECT_NAME)
+ include(CTest)
+endif()
include(GNUInstallDirs)
include(GNUInstallDirs)
+include(CMakePackageConfigHelpers)
find_package(PkgConfig)
find_package(PkgConfig)
+set(THREADS_PREFER_PTHREAD_FLAG ON)
find_package(Threads REQUIRED)
# locals
find_package(Threads REQUIRED)
# locals
@@
-16,6
+17,7
@@
include(CheckDebug)
include(CheckDecl)
include(CheckDependency)
include(CheckHeader)
include(CheckDecl)
include(CheckDependency)
include(CheckHeader)
+include(CheckCompiles)
include(CheckType)
include(CheckStdatomic)
include(CheckType)
include(CheckStdatomic)
@@
-33,10
+35,15
@@
endif()
## dtrace
if(ENABLE_DTRACE)
## dtrace
if(ENABLE_DTRACE)
- set(HAVE_DTRACE 1)
+ find_package(DTrace)
+ if(DTRACE_EXECUTABLE)
+ set(HAVE_DTRACE 1)
+ else()
+ message(WARNING "The dtrace command is required to enable dtrace/systemtap support.")
+ endif()
endif()
endif()
-##uuid
+##
uuid
if(BUILD_TESTING)
check_dependency(LIBUUID uuid uuid/uuid.h)
endif()
if(BUILD_TESTING)
check_dependency(LIBUUID uuid uuid/uuid.h)
endif()
@@
-50,13
+57,13
@@
if(ENABLE_SASL)
endif()
## hashes
endif()
## hashes
-if(ENABLE_
FNV64_HASH
)
+if(ENABLE_
HASH_FNV64
)
set(HAVE_FNV64_HASH 1)
endif()
set(HAVE_FNV64_HASH 1)
endif()
-if(ENABLE_
MURMUR_HASH
)
+if(ENABLE_
HASH_MURMUR
)
set(HAVE_MURMUR_HASH 1)
endif()
set(HAVE_MURMUR_HASH 1)
endif()
-if(ENABLE_H
SIEH_HAS
H)
+if(ENABLE_H
ASH_HSIE
H)
set(HAVE_HSIEH_HASH 1)
endif()
set(HAVE_HSIEH_HASH 1)
endif()
@@
-92,8
+99,10
@@
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(MSG_NOSIGNAL sys/socket.h)
check_decl(rcvtimeo sys/socket.h)
check_decl(sndtimeo sys/socket.h)
-check_decl(s
trerror_r string
.h)
+check_decl(s
etenv stdlib
.h)
check_decl(strerror string.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)
set(HAVE_GCC_ABI_DEMANGLE ${HAVE_ABI____CXA_DEMANGLE})
check_decl(abi::__cxa_demangle cxxabi.h)
set(HAVE_GCC_ABI_DEMANGLE ${HAVE_ABI____CXA_DEMANGLE})