From: Yehuda Sadeh <yehuda@redhat.com>
Date: Mon, 7 Nov 2016 23:45:11 +0000 (-0800)
Subject: spdk: cmake fixes
X-Git-Tag: v11.1.0~362^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=refs%2Fpull%2F11882%2Fhead;p=ceph.git

spdk: cmake fixes

Signed-off-by: Yehuda Sadeh <yehuda@redhat.com>
---

diff --git a/src/os/CMakeLists.txt b/src/os/CMakeLists.txt
index 8dc9508c56ca..4aff17d1abb3 100644
--- a/src/os/CMakeLists.txt
+++ b/src/os/CMakeLists.txt
@@ -95,6 +95,7 @@ if(HAVE_LIBAIO)
 endif()
 
 if(WITH_SPDK)
+  include_directories("${CMAKE_SOURCE_DIR}/src/spdk/include")
   add_custom_target(build_spdk
     COMMAND
     $(MAKE) DPDK_INC_DIR=${DPDK_INCLUDE_DIR}
@@ -105,6 +106,7 @@ if(WITH_SPDK)
   foreach(lib nvme memory util)
     add_library(spdk_${lib} STATIC IMPORTED)
     add_dependencies(spdk_${lib} build_spdk)
+    target_link_libraries(os LINK_PRIVATE spdk_${lib})
     set_target_properties(spdk_${lib} PROPERTIES
       IMPORTED_LOCATION "${CMAKE_SOURCE_DIR}/src/spdk/lib/${lib}/libspdk_${lib}.a"
       INTERFACE_INCLUDE_DIRECTORIES "${CMAKE_SOURCE_DIR}/src/spdk/include")