From: Deepika Upadhyay <dupadhya@redhat.com>
Date: Fri, 22 Nov 2019 14:21:55 +0000 (+0530)
Subject: cmake/modules: look for GNU make first instead of BSD make
X-Git-Tag: v15.1.0~754^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=refs%2Fpull%2F31781%2Fhead;p=ceph.git

cmake/modules: look for GNU make first instead of BSD make

  * BuildDPDK.cmake, BuildSPDK.cmake:
      * give priority to build with gmake
      * throw error if make not found

Signed-off-by: Deepika Upadhyay <dupadhya@redhat.com>
---

diff --git a/cmake/modules/BuildDPDK.cmake b/cmake/modules/BuildDPDK.cmake
index f858bedc91c1..2c21fd9d0b39 100644
--- a/cmake/modules/BuildDPDK.cmake
+++ b/cmake/modules/BuildDPDK.cmake
@@ -1,5 +1,8 @@
 function(do_build_dpdk dpdk_dir)
-  find_program (MAKE_EXECUTABLE NAMES make gmake)
+  find_program(MAKE_EXECUTABLE NAMES gmake make)
+  if(NOT MAKE_EXECUTABLE)
+    message(FATAL_ERROR "Can't find make")
+  endif()
   # mk/machine/native/rte.vars.mk
   # rte_cflags are extracted from mk/machine/${machine}/rte.vars.mk
   # only 3 of them have -march=<arch> defined, so copying them here.
diff --git a/cmake/modules/BuildSPDK.cmake b/cmake/modules/BuildSPDK.cmake
index 2522ccffa476..2e9b31b8d0d2 100644
--- a/cmake/modules/BuildSPDK.cmake
+++ b/cmake/modules/BuildSPDK.cmake
@@ -10,7 +10,10 @@ macro(build_spdk)
     find_package(uuid REQUIRED)
   endif()
 
-  find_program (MAKE_EXECUTABLE NAMES make gmake)
+  find_program(MAKE_EXECUTABLE NAMES gmake make)
+  if(NOT MAKE_EXECUTABLE)
+    message(FATAL_ERROR "Can't find make")
+  endif()
   if(CMAKE_MAKE_PROGRAM MATCHES "make")
     # try to inherit command line arguments passed by parent "make" job
     set(make_cmd "$(MAKE)")