build: conditionally-compile libradosstriper (cmakedefine)

Signed-off-by: Jesse Williamson <jwilliamson@suse.de>

CMakeLists.txt

@@ -352,6 +352,13 @@ find_package(dpdk)
 set(HAVE_DPDK ${DPDK_FOUND})
 endif(WITH_DPDK)
 
+option(WITH_LIBRADOSSTRIPER "Build with libradosstriper support." ON)
+if(WITH_LIBRADOSSTRIPER)
+  message(STATUS "Enabling libradosstriper in \"rados\" tool.")
+else()
+  message(STATUS "Disabling libradosstriper support in \"rados\" tool.")
+endif()
+
 option(WITH_BLKIN "Use blkin to emit LTTng tracepoints for Zipkin" OFF)
 if(WITH_BLKIN)
   set(BLKIN_LIBRARIES blkin lttng-ust)
@@ -607,5 +614,4 @@ add_tags(ctags
   EXCLUDES "*.js" "*.css")
 add_custom_target(tags DEPENDS ctags)
 
-option(WITH_LIBRADOSSTRIPER "Build with libradosstriper support." ON)
 

src/include/config-h.in.cmake

@@ -129,7 +129,6 @@
 /* Accelio conditional compilation */
 #cmakedefine HAVE_XIO
 
-
 /* AsyncMessenger RDMA conditional compilation */
 #cmakedefine HAVE_RDMA
 
@@ -324,4 +323,7 @@
 /* Defined if getentropy() is available */
 #cmakedefine HAVE_GETENTROPY
 
+/* Define if libradosstriper is enabled: */
+#cmakedefine WITH_LIBRADOSSTRIPER
+
 #endif /* CONFIG_H */

src/tools/CMakeLists.txt

@@ -9,11 +9,6 @@ add_executable(rados ${rados_srcs})
 target_link_libraries(rados librados global ${BLKID_LIBRARIES} ${CMAKE_DL_LIBS} radosstriper)
 install(TARGETS rados DESTINATION bin)
 
-if(WITH_LIBRADOSSTRIPER)
-  message(STATUS " Using libradosstriper.")
-  add_definitions("-DWITH_LIBRADOSSTRIPER")
-endif()
-
 if(WITH_TESTS)
 add_executable(ceph_scratchtool scratchtool.c)
 target_link_libraries(ceph_scratchtool librados global)