cmake,modules: remove Findpciaccess.cmake

Now SPDK uses the DPDK's library for PCI device
enumeration, we can remove this dependency

Signed-off-by: optimistyzy <optimistyzy@gmail.com>

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 0ed4c24f7edcc496c1c93d420fff20ce2cd16d3f..80260d5d197e80f63e5b91c0659c825f49b19241 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -219,7 +219,6 @@ endif(${WITH_XFS})
 
 option(WITH_SPDK "Enable SPDK" OFF)
 if(WITH_SPDK)
-  find_package(pciaccess REQUIRED)
   find_package(dpdk REQUIRED)
   set(HAVE_SPDK TRUE)
 endif(WITH_SPDK)

diff --git a/cmake/modules/Findpciaccess.cmake b/cmake/modules/Findpciaccess.cmake
deleted file mode 100644 (file)
index 6e5bd52..0000000
--- a/cmake/modules/Findpciaccess.cmake
+++ /dev/null
@@ -1,15 +0,0 @@
-# Try to find pciaccess
-#
-# Once done, this will define
-#
-# PCIACCESS_FOUND
-# PCIACCESS_INCLUDE_DIR
-# PCIACCESS_LIBRARIES
-
-find_path(PCIACCESS_INCLUDE_DIR pciaccess.h)
-find_library(PCIACCESS_LIBRARIES pciaccess)
-
-include(FindPackageHandleStandardArgs)
-find_package_handle_standard_args(PCIACCESS DEFAULT_MSG PCIACCESS_LIBRARIES PCIACCESS_INCLUDE_DIR)
-
-mark_as_advanced(PCIACCESS_INCLUDE_DIR PCIACCESS_LIBRARIES)

diff --git a/src/os/CMakeLists.txt b/src/os/CMakeLists.txt
index 2c4138a9319f86120cf38a99613f6780b72a6523..f751f97ed038e14ecc3b0519756f2547c70d16dd 100644 (file)
--- a/src/os/CMakeLists.txt
+++ b/src/os/CMakeLists.txt
@@ -71,12 +71,10 @@ endif()
 if(WITH_SPDK)
   target_link_libraries(os
     ${SPDK_LIBRARIES}
-    ${DPDK_LIBRARIES}
-    ${PCIACCESS_LIBRARIES})
+    ${DPDK_LIBRARIES})
   target_include_directories(os
     PRIVATE
-    ${DPDK_INCLUDE_DIR}
-    ${PCIACCESS_INCLUDE_DIR})
+    ${DPDK_INCLUDE_DIR})
 endif(WITH_SPDK)
 
 if(WITH_LTTNG)

diff --git a/src/os/bluestore/NVMEDevice.h b/src/os/bluestore/NVMEDevice.h
index 244e81ade368be11e4ecb9bcb7fb7d3d68f2946c..5f44738f8b0c36c53c542cee0440924078496410 100644 (file)
--- a/src/os/bluestore/NVMEDevice.h
+++ b/src/os/bluestore/NVMEDevice.h
@@ -19,7 +19,6 @@
 
 #include <queue>
 #include <map>
-#include <pciaccess.h>
 #include <limits>
 
 // since _Static_assert introduced in c11