From: optimistyzy <optimistyzy@gmail.com>
Date: Wed, 4 Jan 2017 02:17:06 +0000 (+0800)
Subject: cmake,modules: remove Findpciaccess.cmake
X-Git-Tag: v12.0.0~276^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=refs%2Fpull%2F12776%2Fhead;p=ceph.git

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 0ed4c24f7edc..80260d5d197e 100644
--- 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
index 6e5bd52b01f1..000000000000
--- 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 2c4138a9319f..f751f97ed038 100644
--- 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 244e81ade368..5f44738f8b0c 100644
--- 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