From: Kefu Chai <kchai@redhat.com>
Date: Tue, 21 Nov 2017 09:45:44 +0000 (+0800)
Subject: cmake: BuildDPDK: use ${CMAKE_MAKE_PROGRAM} when appropriate
X-Git-Tag: v13.0.1~130^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=refs%2Fpull%2F19017%2Fhead;p=ceph.git

cmake: BuildDPDK: use ${CMAKE_MAKE_PROGRAM} when appropriate

DPDK requires GNU Make. see
spdk/dpdk/doc/guides/freebsd_gsg/build_dpdk.rst. so, we should use the
configured make program to do the job.

Signed-off-by: Kefu Chai <kchai@redhat.com>
---

diff --git a/cmake/modules/BuildDPDK.cmake b/cmake/modules/BuildDPDK.cmake
index 1b824ae5b927..8b28cf97ced7 100644
--- a/cmake/modules/BuildDPDK.cmake
+++ b/cmake/modules/BuildDPDK.cmake
@@ -51,7 +51,7 @@ function(do_build_dpdk dpdk_dir)
   set(target "${arch}-${machine_tmpl}-${execenv}-${toolchain}")
 
   execute_process(
-    COMMAND make showconfigs
+    COMMAND ${CMAKE_MAKE_PROGRAM} showconfigs
     WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}/src/spdk/dpdk
     OUTPUT_VARIABLE supported_targets
     OUTPUT_STRIP_TRAILING_WHITESPACE)
@@ -59,7 +59,8 @@ function(do_build_dpdk dpdk_dir)
   list(FIND supported_targets ${target} found)
   if(found EQUAL -1)
     message(FATAL_ERROR "not able to build DPDK support: "
-      "unsupported target \"${target}\"")
+      "unsupported target. "
+      "\"${target}\" not listed in ${supported_targets}")
   endif()
 
   include(ExternalProject)