X-Git-Url: https://git.m6w6.name/?a=blobdiff_plain;f=CMake%2F_Include.cmake;h=67fe16bfd826c88728cd109ea86a0523899f8311;hb=52f96be72d2f18994d6133c4410c263133270f0e;hp=67963844d64bc70531a2e096a732b6494aa6be63;hpb=169e219154873be30faaa026d09847f438bbea51;p=m6w6%2Flibmemcached

diff --git a/CMake/_Include.cmake b/CMake/_Include.cmake
index 67963844..67fe16bf 100644
--- a/CMake/_Include.cmake
+++ b/CMake/_Include.cmake
@@ -1,10 +1,19 @@
-set(THREADS_PREFER_PTHREAD_FLAG ON)
 
 # globals
-include(CTest)
+if(CMAKE_PROJECT_NAME STREQUAL PROJECT_NAME)
+    include(CTest)
+endif()
 include(GNUInstallDirs)
+include(CMakePackageConfigHelpers)
 
+if(CMAKE_HOST_SYSTEM_NAME STREQUAL "FreeBSD")
+    find_program(PKGCONF pkgconf)
+    if(PKGCONF)
+        set(PKG_CONFIG_EXECUTABLE ${PKGCONF})
+    endif()
+endif()
 find_package(PkgConfig)
+set(THREADS_PREFER_PTHREAD_FLAG ON)
 find_package(Threads REQUIRED)
 
 # locals
@@ -31,8 +40,14 @@ if(ENABLE_MEMASLAP)
 endif()
 
 ## dtrace
+include(EnableDtrace)
 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
@@ -61,10 +76,10 @@ endif()
 
 # system checks
 
+check_header(alloca.h)
 check_header(arpa/inet.h)
 check_header(dlfcn.h)
 check_header(errno.h)
-check_header(execinfo.h)
 check_header(fcntl.h)
 check_header(io.h)
 check_header(limits.h)
@@ -91,11 +106,17 @@ 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(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(strerror string.h)
+
 check_decl(abi::__cxa_demangle cxxabi.h)
-set(HAVE_GCC_ABI_DEMANGLE ${HAVE_ABI____CXA_DEMANGLE})
+
+find_package(Backtrace)
+if(Backtrace_FOUND)
+    set(HAVE_BACKTRACE 1)
+endif()
 
 check_type(in_port_t netinet/in.h)