From: Kefu Chai <kchai@redhat.com>
Date: Thu, 28 Jun 2018 08:56:58 +0000 (+0800)
Subject: cmake: consolidate WITH_{VERBS,RDMACM}
X-Git-Tag: v14.0.1~977^2~2
X-Git-Url: http://git.apps.os.sepia.ceph.com/?a=commitdiff_plain;h=38d0e22685b6c9c236a6868bfaed796929380289;p=ceph.git

cmake: consolidate WITH_{VERBS,RDMACM}

Signed-off-by: Kefu Chai <kchai@redhat.com>
---

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 0c9513dc9e00d..517a094b53087 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -172,17 +172,14 @@ if(WITH_STATIC_LIBSTDCXX)
   endif()
 endif()
 
-option(WITH_VERBS "Enable RDMA verbs in async messenger" ON)
-if(WITH_VERBS)
+option(WITH_RDMA "Enable RDMA in async messenger" ON)
+if(WITH_RDMA)
   find_package(verbs REQUIRED)
   set(HAVE_VERBS ${VERBS_FOUND})
-endif(WITH_VERBS)
-
-option(WITH_RDMACM "Enable RDMA cm in async messenger" ON)
-if(WITH_RDMACM)
   find_package(rdmacm REQUIRED)
   set(HAVE_RDMACM ${RDMACM_FOUND})
-endif(WITH_RDMACM)
+  set(HAVE_RDMA TRUE)
+endif()
 
 find_package(Backtrace)
 
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index a35b8b47ade99..1b857599e592d 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -411,7 +411,7 @@ if(HAVE_XIO)
 endif(HAVE_XIO)
 
 set(async_rdma_common_srcs)
-if(HAVE_VERBS AND HAVE_RDMACM)
+if(HAVE_RDMA)
   list(APPEND async_rdma_common_srcs
     msg/async/rdma/Infiniband.cc
     msg/async/rdma/RDMAConnectedSocketImpl.cc