From: Casey Bodley Date: Mon, 17 Aug 2015 18:17:23 +0000 (-0400) Subject: cmake: add module and WITH_BLKIN option for blkin X-Git-Tag: v12.0.3~73^2~30 X-Git-Url: http://git.apps.os.sepia.ceph.com/?a=commitdiff_plain;h=5ec55b9daa88234d6e088dcf0d681e7d1a140646;p=ceph.git cmake: add module and WITH_BLKIN option for blkin Signed-off-by: Casey Bodley --- diff --git a/CMakeLists.txt b/CMakeLists.txt index fd98fffdd1ef6..6ce98f65c5315 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -337,6 +337,12 @@ find_package(dpdk) set(HAVE_DPDK ${DPDK_FOUND}) endif(WITH_DPDK) +option(WITH_BLKIN "Use blkin to emit LTTng tracepoints for Zipkin" OFF) +if(WITH_BLKIN) + find_package(blkin REQUIRED) + include_directories(${BLKIN_INCLUDE_DIR}) +endif(WITH_BLKIN) + #option for RGW option(WITH_RADOSGW "Rados Gateway is enabled" ON) option(WITH_RADOSGW_FCGI_FRONTEND "Rados Gateway's FCGI frontend is enabled" ON) diff --git a/cmake/modules/Findblkin.cmake b/cmake/modules/Findblkin.cmake new file mode 100644 index 0000000000000..cfa697b9d7f80 --- /dev/null +++ b/cmake/modules/Findblkin.cmake @@ -0,0 +1,23 @@ +# - Try to find blkin +# Once done this will define +# BLKIN_FOUND - System has blkin +# BLKIN_INCLUDE_DIR - The blkin include directories +# BLKIN_LIBRARIES - The libraries needed to use blkin + +find_package(PkgConfig) +pkg_check_modules(PC_BLKIN QUIET libblkin) + +find_path(BLKIN_INCLUDE_DIR ztracer.hpp + HINTS ${PC_BLKIN_INCLUDEDIR} ${PC_BLKIN_INCLUDE_DIRS} + PATH_SUFFIXES blkin) +find_library(BLKIN_LIBRARY NAMES blkin + HINTS ${PC_BLKIN_LIBDIR} ${PC_BLKIN_LIBRARY_DIRS}) + +include(FindPackageHandleStandardArgs) +# handle the QUIETLY and REQUIRED arguments and set BLKIN_FOUND to TRUE +# if all listed variables are TRUE +find_package_handle_standard_args(blkin DEFAULT_MSG + BLKIN_LIBRARY BLKIN_INCLUDE_DIR) + +set(BLKIN_LIBRARIES ${BLKIN_LIBRARY} lttng-ust) +mark_as_advanced(BLKIN_INCLUDE_DIR BLKIN_LIBRARIES) diff --git a/src/include/config-h.in.cmake b/src/include/config-h.in.cmake index d6768f8b666fd..8a903ef610836 100644 --- a/src/include/config-h.in.cmake +++ b/src/include/config-h.in.cmake @@ -301,6 +301,9 @@ /* Defined if pthread_setname_np() is available */ #cmakedefine HAVE_PTHREAD_SETNAME_NP 1 +/* Defined if blkin enabled */ +#cmakedefine WITH_BLKIN + /* Defined if pthread_set_name_np() is available */ #cmakedefine HAVE_PTHREAD_SET_NAME_NP