X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=src%2Fplugins%2Frdma%2FCMakeLists.txt;h=86fc68f550a76bf8eaf48a7f912a02592a772a6a;hb=f126e746fc01c75bc99329d10ce9127b26b23814;hp=35d43db28a153f47e3d90674106c68063654dd9d;hpb=fe750c248be58b76479836639fbd0c4617210aa5;p=vpp.git

diff --git a/src/plugins/rdma/CMakeLists.txt b/src/plugins/rdma/CMakeLists.txt
index 35d43db28a1..86fc68f550a 100644
--- a/src/plugins/rdma/CMakeLists.txt
+++ b/src/plugins/rdma/CMakeLists.txt
@@ -11,41 +11,42 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-message(STATUS "RDMA plugins - looking for ibverbs")
-
 find_path(IBVERBS_INCLUDE_DIR NAMES infiniband/verbs.h)
-find_library(IBVERBS_LIB NAMES libibverbs.a)
-find_library(MLX5_LIB NAMES libmlx5.a)
 
-if (NOT IBVERBS_LIB OR NOT MLX5_LIB)
-  message(WARNING "RDMA plugins - ibverbs not found - rdma_plugin disabled")
+if (NOT IBVERBS_INCLUDE_DIR)
+  message(WARNING "-- rdma headers not found - rdma plugin disabled")
   return()
 endif()
 
-if (MLX5_LIB)
-  string_append(RDMA_LINK_FLAGS "-Wl,--whole-archive,${MLX5_LIB},--no-whole-archive")
+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)
+
+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()
 
-set(CMAKE_REQUIRED_FLAGS "-fPIC -shared ${IBVERBS_LIB} ${RDMA_LINK_FLAGS}")
-CHECK_C_SOURCE_COMPILES("" IBVERBS_COMPILES_CHECK)
+string_append(RDMA_LINK_FLAGS "-Wl,--whole-archive,${MLX5_LIB},--no-whole-archive")
+
+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")
+  message(WARNING "rdma plugins - no working ibverbs found - rdma plugin disabled")
   return()
 endif()
 
-message(STATUS "RDMA plugins - found ${IBVERBS_INCLUDE_DIR}")
-message(STATUS "RDMA plugins - found ${IBVERBS_LIB}")
-message(STATUS "RDMA plugins - found ${MLX5_LIB}")
-
 include_directories(${IBVERBS_INCLUDE_DIR})
 
 add_vpp_plugin(rdma
   SOURCES
+  api.c
   cli.c
   device.c
   format.c
   plugin.c
+  unformat.c
   input.c
   output.c
 
@@ -53,9 +54,17 @@ add_vpp_plugin(rdma
   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}
+  ${RDMA_UTIL_LIB}
 )