From abf3dc0cf9ae92538bb69f403f8c2622b9d5c674 Mon Sep 17 00:00:00 2001 From: Deepika Upadhyay Date: Fri, 22 Nov 2019 19:51:55 +0530 Subject: [PATCH] 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 --- cmake/modules/BuildDPDK.cmake | 5 ++++- cmake/modules/BuildSPDK.cmake | 5 ++++- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/cmake/modules/BuildDPDK.cmake b/cmake/modules/BuildDPDK.cmake index f858bedc91c..2c21fd9d0b3 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= defined, so copying them here. diff --git a/cmake/modules/BuildSPDK.cmake b/cmake/modules/BuildSPDK.cmake index 2522ccffa47..2e9b31b8d0d 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)") -- 2.47.3