]> git.apps.os.sepia.ceph.com Git - ceph-ci.git/commitdiff
cmake: use make explicitly to build fio
authorKefu Chai <kchai@redhat.com>
Mon, 9 Nov 2020 07:34:55 +0000 (15:34 +0800)
committerKefu Chai <kchai@redhat.com>
Mon, 9 Nov 2020 07:49:26 +0000 (15:49 +0800)
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 <kchai@redhat.com>
cmake/modules/BuildFIO.cmake

index 9c4d2ddfe27cd420ff4f0ec172453ad2b3b0b8ce..f0a9c0e332756cf571c9d64d2d0bed3122d121b3 100644 (file)
@@ -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 <SOURCE_DIR>/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 <BINARY_DIR>/fio ${CMAKE_BINARY_DIR}/bin)
 endfunction()