Code Review
/
vpp.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
session udp: shared local endpoints
[vpp.git]
/
src
/
plugins
/
rdma
/
CMakeLists.txt
diff --git
a/src/plugins/rdma/CMakeLists.txt
b/src/plugins/rdma/CMakeLists.txt
index
7b6b37c
..
86fc68f
100644
(file)
--- a/
src/plugins/rdma/CMakeLists.txt
+++ b/
src/plugins/rdma/CMakeLists.txt
@@
-19,19
+19,18
@@
if (NOT IBVERBS_INCLUDE_DIR)
endif()
vpp_plugin_find_library(rdma IBVERBS_LIB libibverbs.a)
endif()
vpp_plugin_find_library(rdma IBVERBS_LIB libibverbs.a)
+vpp_plugin_find_library(rdma RDMA_UTIL_LIB librdma_util.a)
vpp_plugin_find_library(rdma MLX5_LIB libmlx5.a)
vpp_plugin_find_library(rdma MLX5_LIB libmlx5.a)
-if (NOT IBVERBS_LIB OR NOT MLX5_LIB)
+if (NOT IBVERBS_LIB OR NOT
RDMA_UTIL_LIB OR NOT
MLX5_LIB)
message(WARNING "rdma plugin - ibverbs not found - rdma plugin disabled")
return()
endif()
message(WARNING "rdma plugin - ibverbs not found - rdma plugin disabled")
return()
endif()
-if (MLX5_LIB)
- string_append(RDMA_LINK_FLAGS "-Wl,--whole-archive,${MLX5_LIB},--no-whole-archive")
-endif()
+string_append(RDMA_LINK_FLAGS "-Wl,--whole-archive,${MLX5_LIB},--no-whole-archive")
-set(CMAKE_REQUIRED_FLAGS "-fPIC -shared
${IBVERBS_LIB} ${RDMA_LINK_FLAGS
}")
-CHECK_C_SOURCE_COMPILES("" IBVERBS_COMPILES_CHECK)
+set(CMAKE_REQUIRED_FLAGS "-fPIC -shared
-pthread ${RDMA_LINK_FLAGS} ${IBVERBS_LIB} ${RDMA_UTIL_LIB
}")
+CHECK_C_SOURCE_COMPILES("
int main(void) { return 0; }
" IBVERBS_COMPILES_CHECK)
if (NOT IBVERBS_COMPILES_CHECK)
message(WARNING "rdma plugins - no working ibverbs found - rdma plugin disabled")
if (NOT IBVERBS_COMPILES_CHECK)
message(WARNING "rdma plugins - no working ibverbs found - rdma plugin disabled")
@@
-42,10
+41,12
@@
include_directories(${IBVERBS_INCLUDE_DIR})
add_vpp_plugin(rdma
SOURCES
add_vpp_plugin(rdma
SOURCES
+ api.c
cli.c
device.c
format.c
plugin.c
cli.c
device.c
format.c
plugin.c
+ unformat.c
input.c
output.c
input.c
output.c
@@
-53,9
+54,17
@@
add_vpp_plugin(rdma
input.c
output.c
input.c
output.c
+ API_FILES
+ rdma.api
+
+ API_TEST_SOURCES
+ unformat.c
+ test_api.c
+
LINK_FLAGS
"${RDMA_LINK_FLAGS}"
LINK_LIBRARIES
${IBVERBS_LIB}
LINK_FLAGS
"${RDMA_LINK_FLAGS}"
LINK_LIBRARIES
${IBVERBS_LIB}
+ ${RDMA_UTIL_LIB}
)
)