Permalink
Browse files

Merge pull request #12776 from optimistyzy/201714

cmake: remove Findpciaccess.cmake

Reviewed-by: Kefu Chai <kefu@redhat.com>
Reviewed-by: Pan Liu <pan.liu@istuary.com>
  • Loading branch information...
2 parents 86f0ddb + 52494f1 commit 836c5686b576ef46c3ff35cf39d306429c516e76 @yuyuyu101 yuyuyu101 committed on GitHub Jan 6, 2017
Showing with 2 additions and 21 deletions.
  1. +0 −1 CMakeLists.txt
  2. +0 −15 cmake/modules/Findpciaccess.cmake
  3. +2 −4 src/os/CMakeLists.txt
  4. +0 −1 src/os/bluestore/NVMEDevice.h
View
@@ -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)
@@ -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)
@@ -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)
@@ -19,7 +19,6 @@
#include <queue>
#include <map>
-#include <pciaccess.h>
#include <limits>
// since _Static_assert introduced in c11

0 comments on commit 836c568

Please sign in to comment.