X-Git-Url: https://git.m6w6.name/?a=blobdiff_plain;f=CMake%2F_Include.cmake;h=00da54f9a46b0012a4bc9a0cb71759ea61be09b7;hb=cdff9052fb343b977fc63ae65a947958eedaab91;hp=9e73358ab354a0dd8d7cb4a4eb71cf9911893a2f;hpb=cbec7a4b9613b8ae3807539fae3a29ed8aff4984;p=awesomized%2Flibmemcached

diff --git a/CMake/_Include.cmake b/CMake/_Include.cmake
index 9e73358a..00da54f9 100644
--- a/CMake/_Include.cmake
+++ b/CMake/_Include.cmake
@@ -1,5 +1,3 @@
-set(CMAKE_MODULE_PATH ${CMAKE_SOURCE_DIR}/CMake)
-
 set(THREADS_PREFER_PTHREAD_FLAG ON)
 
 # globals
@@ -10,11 +8,13 @@ find_package(PkgConfig)
 find_package(Threads REQUIRED)
 
 # locals
+include(InstallPublicHeaders)
 include(SafeString)
 include(CheckDebug)
 include(CheckDecl)
 include(CheckDependency)
 include(CheckHeader)
+include(CheckCompiles)
 include(CheckType)
 include(CheckStdatomic)
 
@@ -32,10 +32,15 @@ endif()
 
 ## 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()
 
-##uuid
+## uuid
 if(BUILD_TESTING)
     check_dependency(LIBUUID uuid uuid/uuid.h)
 endif()
@@ -49,13 +54,13 @@ if(ENABLE_SASL)
 endif()
 
 ## hashes
-if(ENABLE_FNV64_HASH)
+if(ENABLE_HASH_FNV64)
     set(HAVE_FNV64_HASH 1)
 endif()
-if(ENABLE_MURMUR_HASH)
+if(ENABLE_HASH_MURMUR)
     set(HAVE_MURMUR_HASH 1)
 endif()
-if(ENABLE_HSIEH_HASH)
+if(ENABLE_HASH_HSIEH)
     set(HAVE_HSIEH_HASH 1)
 endif()
 
@@ -91,8 +96,9 @@ 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(strerror_r 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})