From b6bae7ba13b9e1c7c7d2db370e44662d9964cfdf Mon Sep 17 00:00:00 2001 From: Kefu Chai Date: Mon, 9 Nov 2020 15:34:55 +0800 Subject: [PATCH] cmake: use make explicitly to build fio we cannot assume that user uses "make" as the generator of cmake, if, for instance, ninja is used, `$(MAKE)` is not a valid variable in the generated `build.ninja`. so we should use "make" explicitly. Signed-off-by: Kefu Chai --- cmake/modules/BuildFIO.cmake | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/cmake/modules/BuildFIO.cmake b/cmake/modules/BuildFIO.cmake index 9c4d2ddfe27..f0a9c0e3327 100644 --- a/cmake/modules/BuildFIO.cmake +++ b/cmake/modules/BuildFIO.cmake @@ -5,6 +5,10 @@ function(build_fio) if(ALLOCATOR) set(FIO_EXTLIBS EXTLIBS=-l${ALLOCATOR}) endif() + + include(FindMake) + find_make("MAKE_EXECUTABLE" "make_cmd") + ExternalProject_Add(fio_ext DOWNLOAD_DIR ${CMAKE_BINARY_DIR}/src/ UPDATE_COMMAND "" # this disables rebuild on each run @@ -15,6 +19,6 @@ function(build_fio) SOURCE_DIR ${CMAKE_BINARY_DIR}/src/fio BUILD_IN_SOURCE 1 CONFIGURE_COMMAND /configure - BUILD_COMMAND $(MAKE) fio EXTFLAGS=-Wno-format-truncation ${FIO_EXTLIBS} + BUILD_COMMAND ${make_cmd} fio EXTFLAGS=-Wno-format-truncation ${FIO_EXTLIBS} INSTALL_COMMAND cp /fio ${CMAKE_BINARY_DIR}/bin) endfunction()