Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

cmake: remove Findpciaccess.cmake #12776

Merged
merged 1 commit into from Jan 6, 2017
Merged

cmake: remove Findpciaccess.cmake #12776

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
1 change: 0 additions & 1 deletion CMakeLists.txt
View file
Open in desktop
Expand Up @@ -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)
Expand Down
15 changes: 0 additions & 15 deletions cmake/modules/Findpciaccess.cmake
View file
Open in desktop

This file was deleted.

6 changes: 2 additions & 4 deletions src/os/CMakeLists.txt
View file
Open in desktop
Expand Up @@ -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})
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

then you might need to remove find_package(pciaccess REQUIRED) in CMakeLists.txt and #include <pciaccess.h> in NVMEDevice.h as well.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Let me update it

endif(WITH_SPDK)

if(WITH_LTTNG)
Expand Down
1 change: 0 additions & 1 deletion src/os/bluestore/NVMEDevice.h
View file
Open in desktop
Expand Up @@ -19,7 +19,6 @@

#include <queue>
#include <map>
#include <pciaccess.h>
#include <limits>

// since _Static_assert introduced in c11
Expand Down