From: Kefu Chai <kchai@redhat.com>
Date: Mon, 9 Nov 2020 07:36:47 +0000 (+0800)
Subject: cmake: drop WITH_SYSTEM_FIO option
X-Git-Tag: v16.1.0~653^2~1
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=d16f7fb524d3d10408fc63ba43672eb83e0ca290;p=ceph.git

cmake: drop WITH_SYSTEM_FIO option

there is no well-known distro packaging fio.h, so drop this option.

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

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 47ad8460f557..9ae3dac66c61 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -506,10 +506,7 @@ set(CEPH_TEST_TIMEOUT 3600 CACHE STRING
 
 # fio
 option(WITH_FIO "build with fio plugin enabled" OFF)
-option(WITH_SYSTEM_FIO "require and build with system fio" OFF)
-if(WITH_SYSTEM_FIO)
-  find_package(fio REQUIRED)
-elseif(WITH_FIO)
+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)
diff --git a/cmake/modules/Findfio.cmake b/cmake/modules/Findfio.cmake
deleted file mode 100644
index ec91ca5aaccb..000000000000
--- a/cmake/modules/Findfio.cmake
+++ /dev/null
@@ -1,12 +0,0 @@
-# - Find Fio
-# Find the fio includes
-#
-# FIO_INCLUDE_DIR - where to find fio.h
-# FIO_FOUND - True if fio is found.
-
-find_path(FIO_INCLUDE_DIR NAMES fio.h HINTS ENV FIO_ROOT_DIR)
-
-include(FindPackageHandleStandardArgs)
-find_package_handle_standard_args(fio DEFAULT_MSG FIO_INCLUDE_DIR)
-
-mark_as_advanced(FIO_INCLUDE_DIR)
diff --git a/src/test/CMakeLists.txt b/src/test/CMakeLists.txt
index 6ab0f0c8b414..0e0dab52704c 100644
--- a/src/test/CMakeLists.txt
+++ b/src/test/CMakeLists.txt
@@ -75,7 +75,7 @@ if(WITH_SEASTAR)
   add_subdirectory(crimson)
 endif()
 add_subdirectory(system)
-if(WITH_FIO OR WITH_SYSTEM_FIO)
+if(WITH_FIO)
   add_subdirectory(fio)
 endif()
 add_subdirectory(lazy-omap-stats)
@@ -504,7 +504,7 @@ if(WITH_RADOSGW)
   add_dependencies(tests radosgwd radosgw-admin)
 endif()
 #add dependency from fio just to ensure the plugin build isn't failing
-if(WITH_FIO OR WITH_SYSTEM_FIO)
+if(WITH_FIO)
   add_dependencies(tests fio_ceph_objectstore)
 endif()