]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commitdiff
cmake: do not depend on ${DPDK_LIBRARIES} if not using bundled dpdk 23885/head
authorKefu Chai <kchai@redhat.com>
Sun, 8 Jul 2018 10:21:37 +0000 (18:21 +0800)
committerNathan Cutler <ncutler@suse.com>
Sun, 2 Sep 2018 17:09:47 +0000 (19:09 +0200)
${DPDK_LIBRARIES} will be link flags instead of library targets if
libdpdk is not built using the bundled source.

Fixes: http://tracker.ceph.com/issues/24449
Signed-off-by: Kefu Chai <kchai@redhat.com>
(cherry picked from commit 1c41870184a3857d94ccf2c77958e2f0aad8dad8)

src/CMakeLists.txt

index 8fca928a5bd2ec15dbeb4703663a529f7babb7b6..1f6041c6bd76dbfe461e0671b4c84364557bef2d 100644 (file)
@@ -681,8 +681,9 @@ if(WITH_DPDK)
   add_library(common_async_dpdk STATIC
     ${common_async_dpdk_files})
   # to ready the dpdk header files
-  add_dependencies(common_async_dpdk
-    ${DPDK_LIBRARIES})
+  if(TARGET dpdk-ext)
+    add_dependencies(common_async_dpdk dpdk-ext)
+  endif()
   list(APPEND ceph_common_deps common_async_dpdk)
   target_link_libraries(common_async_dpdk
     ${DPDK_LIBRARIES})