cmake: add xio

Signed-off-by: Casey Bodley <casey@linuxbox.com>
Signed-off-by: Matt Benjamin <matt@cohortfs.com>

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 1de9314da75ba2eaad266d3486d28c803525498e..f827fcf2a460e66ad7f1657df022f7a2faa200f4 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -223,7 +223,7 @@ else(${ENABLE_SHARED})
 endif(${ENABLE_SHARED})
 
 set(Boost_USE_MULTITHREADED ON)
-find_package(Boost COMPONENTS thread system REQUIRED)
+find_package(Boost COMPONENTS thread system regex REQUIRED)
 include_directories(${Boost_INCLUDE_DIRS})
 
 find_package(Threads REQUIRED)

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 2347c0eccb6230e7c7508c8aac482de4cab4ef97..a055d2cedb3fbba186c89b98586ccc05fcff88e2 100644 (file)
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -15,7 +15,7 @@ set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -rdynamic -Wall -Wtype-limits -Wignored-qual
 
 set(CMAKE_CXX_FLAGS "${CMAKE_C_FLAGS} -ftemplate-depth-1024 -Wno-invalid-offsetof -Wnon-virtual-dtor -Wno-invalid-offsetof -Wstrict-null-sentinel -Woverloaded-virtual")
 
-set(EXTRALIBS uuid rt dl)
+set(EXTRALIBS uuid rt dl ${Boost_LIBS})
 
 if(${WITH_PROFILER})
   list(APPEND EXTRALIBS profiler)
@@ -59,6 +59,11 @@ execute_process(
   OUTPUT_VARIABLE PYTHON_INSTDIR
   OUTPUT_STRIP_TRAILING_WHITESPACE)
 
+if(HAVE_XIO)
+  set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -I${Xio_INCLUDE_DIR}")
+  list(APPEND EXTRALIBS ${Xio_LIBRARY} ibverbs rdmacm pthread rt)
+endif(HAVE_XIO)
+
 if(${WITH_TCMALLOC})
   set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fno-builtin-malloc -fno-builtin-calloc -fno-builtin-realloc -fno-builtin-free")
   set(TCMALLOC_LIBS tcmalloc)
@@ -116,6 +121,17 @@ set(crush_srcs
 
 add_subdirectory(json_spirit)
 
+set(xio_common_srcs)
+if(HAVE_XIO)
+  list(APPEND xio_common_srcs
+    msg/xio/XioConnection.cc
+    msg/xio/XioMsg.cc
+    msg/xio/XioPool.cc
+    msg/xio/XioMessenger.cc
+    msg/xio/XioPortal.cc
+    msg/xio/QueueStrategy.cc)
+endif(HAVE_XIO)
+
 set(libcommon_files
   ${CMAKE_BINARY_DIR}/src/include/ceph_ver.h
   ceph_ver.c

diff --git a/src/erasure-code/lrc/CMakeLists.txt b/src/erasure-code/lrc/CMakeLists.txt
index e6c799850e11d84e92087be9428c70a173facc0f..acb4b54705242a92ac9eb934e660cc41a03eb537 100644 (file)
--- a/src/erasure-code/lrc/CMakeLists.txt
+++ b/src/erasure-code/lrc/CMakeLists.txt
@@ -1,4 +1,4 @@
-# LRC plugin
+# lrc plugin
 
 set(lrc_srcs
   ErasureCodePluginLrc.cc
@@ -6,7 +6,8 @@ set(lrc_srcs
   $<TARGET_OBJECTS:erasure_code_objs>
 )
 
-add_library(ec_LRC SHARED ${lrc_srcs})
-add_dependencies(ec_LRC ${CMAKE_SOURCE_DIR}/src/ceph_ver.h)
-set_target_properties(ec_LRC PROPERTIES VERSION 1.0.0 SOVERSION 1)
-install(TARGETS ec_LRC DESTINATION lib/erasure-code)
+add_library(ec_lrc SHARED ${lrc_srcs})
+add_dependencies(ec_lrc ${CMAKE_SOURCE_DIR}/src/ceph_ver.h)
+target_link_libraries(ec_lrc json_spirit)
+set_target_properties(ec_lrc PROPERTIES VERSION 1.0.0 SOVERSION 1)
+install(TARGETS ec_lrc DESTINATION lib/erasure-code)

diff --git a/src/include/config-h.in.cmake b/src/include/config-h.in.cmake
index a4afaa515752b8ac14e2e0b4ba9ef45cbac4b6e9..fbd2e634178c3d0b85e20545906720abae537893 100644 (file)
--- a/src/include/config-h.in.cmake
+++ b/src/include/config-h.in.cmake
@@ -230,7 +230,7 @@
 #cmakedefine WITH_RADOSGW
 
 /* Defined if XIO */
-#cmakedefine WITH_XIO
+#cmakedefine HAVE_XIO
 
 /* Defined if CDS */
 #cmakedefine HAVE_CDS