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>
ceph · Jan 4, 2017 · f4c3167 · f4c3167
1 parent 988aea4
commit f4c3167
Show file tree

Hide file tree

Showing 4 changed files with 2 additions and 21 deletions.
diff --git 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
diff --git 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
@@ -19,7 +19,6 @@
 
 #include <queue>
 #include <map>
-#include <pciaccess.h>
 #include <limits>
 
 // since _Static_assert introduced in c11