From: Casey Bodley <cbodley@redhat.com>
Date: Wed, 17 Aug 2016 18:15:14 +0000 (-0400)
Subject: cmake: build blkin instead of using find_package
X-Git-Tag: v12.0.3~73^2~10
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=26678e673aa114c3e6f4180cfb5f3e30b538ca9f;p=ceph.git

cmake: build blkin instead of using find_package

Signed-off-by: Casey Bodley <cbodley@redhat.com>
---

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 6ce98f65c531..e33cf17744dd 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -339,8 +339,8 @@ 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})
+  set(BLKIN_LIBRARIES blkin lttng-ust)
+  include_directories(src/blkin/blkin-lib)
 endif(WITH_BLKIN)
 
 #option for RGW
diff --git a/cmake/modules/Findblkin.cmake b/cmake/modules/Findblkin.cmake
deleted file mode 100644
index cfa697b9d7f8..000000000000
--- a/cmake/modules/Findblkin.cmake
+++ /dev/null
@@ -1,23 +0,0 @@
-# - 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/CMakeLists.txt b/src/CMakeLists.txt
index 152e22a74993..25fe953badd2 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -286,6 +286,10 @@ endif()
 set(heap_profiler_files ${TCMALLOC_srcs})
 add_library(heap_profiler_objs OBJECT ${heap_profiler_files})
 
+if (WITH_BLKIN)
+  add_subdirectory(blkin/blkin-lib)
+endif(WITH_BLKIN)
+
 # Common infrastructure
 configure_file(
   ${CMAKE_SOURCE_DIR}/src/ceph_ver.h.in.cmake