]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
cmake: update BuildSPDK for spdk-18.05 22547/head
authorKefu Chai <kchai@redhat.com>
Thu, 14 Jun 2018 01:32:08 +0000 (09:32 +0800)
committerKefu Chai <kchai@redhat.com>
Thu, 14 Jun 2018 01:34:01 +0000 (09:34 +0800)
in spdk v18.05, libuuid is linked by libspdk_util.a, in which,
it is used by lib/util/uuid.c. and libspdk_vol.a uses the wrapper
function exposed by libspdk_util.a, so update the CMakefile script to
reflect the change.

Signed-off-by: Kefu Chai <kchai@redhat.com>
cmake/modules/BuildSPDK.cmake

index 348071228f011ec7b8e8a64e66d2a29683ccfb27..43adff82d2425a0c0a1d7e0a5a60ab72e2acea98 100644 (file)
@@ -30,10 +30,10 @@ macro(build_spdk)
   endforeach()
   set_target_properties(spdk::env_dpdk PROPERTIES
     INTERFACE_LINK_LIBRARIES "${DPDK_LIBRARIES};rt")
-  if(LINUX)
-    set_target_properties(spdk::lvol PROPERTIES
-      INTERFACE_LINK_LIBRARIES ${UUID_LIBRARIES})
-  endif()
+  set_target_properties(spdk::lvol PROPERTIES
+    INTERFACE_LINK_LIBRARIES spdk::util)
+  set_target_properties(spdk::util PROPERTIES
+    INTERFACE_LINK_LIBRARIES ${UUID_LIBRARIES})
   set(SPDK_INCLUDE_DIR "${source_dir}/include")
   unset(source_dir)
 endmacro()