From fae465c89c56aab8b475a4dc97a7f1251df46465 Mon Sep 17 00:00:00 2001
From: Kefu Chai <kchai@redhat.com>
Date: Thu, 28 Jun 2018 16:56:58 +0800
Subject: [PATCH 4/5] cmake: consolidate WITH_{VERBS,RDMACM}

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

diff --git a/CMakeLists.txt b/CMakeLists.txt
index a5cc818e84..192d6f25db 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -176,17 +176,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 66365e3288..8e29b0eee5 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -394,7 +394,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
-- 
2.17.1