From: Kefu Chai <kchai@redhat.com>
Date: Thu, 14 Jun 2018 01:32:08 +0000 (+0800)
Subject: cmake: update BuildSPDK for spdk-18.05
X-Git-Tag: v14.0.1~1116^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=c2026b7473173e021c1f5ee072828538ea5c5d61;p=ceph.git

cmake: update BuildSPDK for spdk-18.05

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>
---

diff --git a/cmake/modules/BuildSPDK.cmake b/cmake/modules/BuildSPDK.cmake
index 348071228f011..43adff82d2425 100644
--- a/cmake/modules/BuildSPDK.cmake
+++ b/cmake/modules/BuildSPDK.cmake
@@ -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()