This is an automated email from the ASF dual-hosted git repository. hulk pushed a commit to branch 2.5 in repository https://gitbox.apache.org/repos/asf/kvrocks.git
commit 4fc295084e0014d5f872043daa4d438b386ca0b0 Author: Hauru <[email protected]> AuthorDate: Fri Jul 28 16:03:14 2023 +0800 build: Fix make warning on GCC (#1605) --- CMakeLists.txt | 6 ++++++ cmake/jemalloc.cmake | 2 +- cmake/lua.cmake | 2 +- cmake/luajit.cmake | 2 +- cmake/lz4.cmake | 2 +- cmake/zstd.cmake | 2 +- 6 files changed, 11 insertions(+), 5 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 2eb497b9..0e7a68a6 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -56,6 +56,12 @@ else() so you can try switching to GCC>=7 or Clang>=5 if you encounter problems") endif() +if(CMAKE_GENERATOR STREQUAL "Ninja") + set(MAKE_COMMAND make) +else() + set(MAKE_COMMAND $(MAKE)) +endif() + set(CMAKE_CXX_STANDARD 17) set(CMAKE_CXX_STANDARD_REQUIRED ON) diff --git a/cmake/jemalloc.cmake b/cmake/jemalloc.cmake index 335d6b31..efad40e1 100644 --- a/cmake/jemalloc.cmake +++ b/cmake/jemalloc.cmake @@ -35,7 +35,7 @@ if(NOT jemalloc_POPULATED) WORKING_DIRECTORY ${jemalloc_BINARY_DIR} ) add_custom_target(make_jemalloc - COMMAND make + COMMAND ${MAKE_COMMAND} WORKING_DIRECTORY ${jemalloc_BINARY_DIR} BYPRODUCTS ${jemalloc_BINARY_DIR}/lib/libjemalloc.a ) diff --git a/cmake/lua.cmake b/cmake/lua.cmake index 841e4629..5cbababa 100644 --- a/cmake/lua.cmake +++ b/cmake/lua.cmake @@ -34,7 +34,7 @@ if(NOT lua_POPULATED) set(LUA_CFLAGS "${LUA_CFLAGS} -isysroot ${CMAKE_OSX_SYSROOT}") endif() - add_custom_target(make_lua COMMAND make "CC=${LUA_CXX}" "CFLAGS=${LUA_CFLAGS}" liblua.a + add_custom_target(make_lua COMMAND ${MAKE_COMMAND} "CC=${LUA_CXX}" "CFLAGS=${LUA_CFLAGS}" liblua.a WORKING_DIRECTORY ${lua_SOURCE_DIR}/src BYPRODUCTS ${lua_SOURCE_DIR}/src/liblua.a ) diff --git a/cmake/luajit.cmake b/cmake/luajit.cmake index 23c24678..e17d0c2d 100644 --- a/cmake/luajit.cmake +++ b/cmake/luajit.cmake @@ -56,7 +56,7 @@ if (NOT lua_POPULATED) set(MACOSX_TARGET "MACOSX_DEPLOYMENT_TARGET=${CMAKE_OSX_DEPLOYMENT_TARGET}") endif () - add_custom_target(make_luajit COMMAND make libluajit.a + add_custom_target(make_luajit COMMAND ${MAKE_COMMAND} libluajit.a "CFLAGS=${LUA_CFLAGS}" ${MACOSX_TARGET} WORKING_DIRECTORY ${luajit_SOURCE_DIR}/src BYPRODUCTS ${luajit_SOURCE_DIR}/src/libluajit.a diff --git a/cmake/lz4.cmake b/cmake/lz4.cmake index 719ce8d3..a89c5086 100644 --- a/cmake/lz4.cmake +++ b/cmake/lz4.cmake @@ -32,7 +32,7 @@ if(NOT lz4_POPULATED) set(APPLE_FLAG "CFLAGS=-isysroot ${CMAKE_OSX_SYSROOT}") endif() - add_custom_target(make_lz4 COMMAND make CC=${CMAKE_C_COMPILER} ${APPLE_FLAG} liblz4.a + add_custom_target(make_lz4 COMMAND ${MAKE_COMMAND} CC=${CMAKE_C_COMPILER} ${APPLE_FLAG} liblz4.a WORKING_DIRECTORY ${lz4_SOURCE_DIR}/lib BYPRODUCTS ${lz4_SOURCE_DIR}/lib/liblz4.a ) diff --git a/cmake/zstd.cmake b/cmake/zstd.cmake index 733ac6f4..4c0032e4 100644 --- a/cmake/zstd.cmake +++ b/cmake/zstd.cmake @@ -32,7 +32,7 @@ if(NOT zstd_POPULATED) set(APPLE_FLAG "CFLAGS=-isysroot ${CMAKE_OSX_SYSROOT}") endif() - add_custom_target(make_zstd COMMAND make CC=${CMAKE_C_COMPILER} ${APPLE_FLAG} libzstd.a + add_custom_target(make_zstd COMMAND ${MAKE_COMMAND} CC=${CMAKE_C_COMPILER} ${APPLE_FLAG} libzstd.a WORKING_DIRECTORY ${zstd_SOURCE_DIR}/lib BYPRODUCTS ${zstd_SOURCE_DIR}/lib/libzstd.a )
