From: Kefu Chai <kchai@redhat.com>
Date: Mon, 9 Nov 2020 07:47:41 +0000 (+0800)
Subject: cmake: expose FIO_INCLUDE_DIR via libfio
X-Git-Tag: v16.1.0~653^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=refs%2Fpull%2F37984%2Fhead;p=ceph.git

cmake: expose FIO_INCLUDE_DIR via libfio

always use the fio built from source for better consistency.

Signed-off-by: Kefu Chai <kchai@redhat.com>
---

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 9ae3dac66c6..e2da7739c26 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -507,10 +507,6 @@ set(CEPH_TEST_TIMEOUT 3600 CACHE STRING
 # fio
 option(WITH_FIO "build with fio plugin enabled" OFF)
 if(WITH_FIO)
-  if (NOT FIO_INCLUDE_DIR)
-    # Use local external fio if include directory is not set
-    set(FIO_INCLUDE_DIR ${CMAKE_BINARY_DIR}/src/fio)
-  endif()
   include(BuildFIO)
   build_fio()
 endif()
diff --git a/cmake/modules/BuildFIO.cmake b/cmake/modules/BuildFIO.cmake
index f0a9c0e3327..d3288cc3309 100644
--- a/cmake/modules/BuildFIO.cmake
+++ b/cmake/modules/BuildFIO.cmake
@@ -21,4 +21,9 @@ function(build_fio)
     CONFIGURE_COMMAND <SOURCE_DIR>/configure
     BUILD_COMMAND ${make_cmd} fio EXTFLAGS=-Wno-format-truncation ${FIO_EXTLIBS}
     INSTALL_COMMAND cp <BINARY_DIR>/fio ${CMAKE_BINARY_DIR}/bin)
+
+  add_library(fio INTERFACE IMPORTED)
+  add_dependencies(fio fio_ext)
+  set_target_properties(fio PROPERTIES
+    INTERFACE_INCLUDE_DIRECTORIES ${CMAKE_BINARY_DIR}/src/fio)
 endfunction()
diff --git a/src/test/fio/CMakeLists.txt b/src/test/fio/CMakeLists.txt
index c55ef37bbb0..ceda247df71 100644
--- a/src/test/fio/CMakeLists.txt
+++ b/src/test/fio/CMakeLists.txt
@@ -1,10 +1,10 @@
 # ObjectStore
 add_library(fio_ceph_objectstore SHARED fio_ceph_objectstore.cc)
-target_include_directories(fio_ceph_objectstore SYSTEM PUBLIC ${FIO_INCLUDE_DIR})
+target_link_libraries(fio_ceph_objectstore fio)
 
 # Messenger
 add_library(fio_ceph_messenger SHARED fio_ceph_messenger.cc)
-target_include_directories(fio_ceph_messenger SYSTEM PUBLIC ${FIO_INCLUDE_DIR})
+target_link_libraries(fio_ceph_messenger fio)
 
 # prevent fio from adding 'typedef int bool' and gettid()
 if(HAVE_GETTID)