[Tarantool-patches] [PATCH] build: support build using Ninja

[Sergey Bronnikov]

By default CMake generates files suitable for building a project with
Make. However, it allows to generate files for Ninja too. Ninja [1] may
build project a bit faster than Make, see [2]. Patch adds changes
required for building with Ninja.

How-to build wit Ninja:

$ cmake -G Ninja -B build -S .
$ ninja -C build luajit

On my laptop Ninja reduces building time by 14% (with Make it takes 5.7
sec, with Ninja 3.9 sec). It is not so much, but without Ninja support in
LuaJIT it is not possible to build Tarantool with Ninja.

1. https://ninja-build.org/
2. https://mesonbuild.com/Simple-comparison.html
---
 src/CMakeLists.txt      | 4 ++--
 src/host/CMakeLists.txt | 6 ++++--
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 1a3f106a..338878fb 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -315,7 +315,7 @@ target_link_libraries(libluajit_shared ${TARGET_LIBS})
 
 add_executable(luajit_static EXCLUDE_FROM_ALL ${CLI_SOURCES})
 set_target_properties(luajit_static PROPERTIES
-  OUTPUT_NAME "${LUAJIT_CLI_NAME}"
+  OUTPUT_NAME "${LUAJIT_CLI_NAME}-static"
   COMPILE_FLAGS "${TARGET_C_FLAGS}"
   LINK_FLAGS "${TARGET_BIN_FLAGS}"
   RUNTIME_OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}"
@@ -327,7 +327,7 @@ target_link_libraries(luajit_static libluajit_static ${TARGET_LIBS})
 
 add_executable(luajit_shared EXCLUDE_FROM_ALL ${CLI_SOURCES})
 set_target_properties(luajit_shared PROPERTIES
-  OUTPUT_NAME "${LUAJIT_CLI_NAME}"
+  OUTPUT_NAME "${LUAJIT_CLI_NAME}-shared"
   COMPILE_FLAGS "${TARGET_C_FLAGS}"
   LINK_FLAGS "${TARGET_BIN_FLAGS}"
   RUNTIME_OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}"
diff --git a/src/host/CMakeLists.txt b/src/host/CMakeLists.txt
index e01db87d..1ce3e224 100644
--- a/src/host/CMakeLists.txt
+++ b/src/host/CMakeLists.txt
@@ -25,11 +25,12 @@ set(DYNASM_DIR ${PROJECT_SOURCE_DIR}/dynasm)
 set(DYNASM_DASC "${LUAJIT_SOURCE_DIR}/vm_${DYNASM_ARCH}.dasc")
 set(DYNASM ${HOST_LUA} ${DYNASM_DIR}/dynasm.lua)
 
+file(GLOB DYNASM_LUA ${DYNASM_DIR}/*.lua)
 add_custom_command(
   COMMENT "Generating buildvm_arch.h"
   OUTPUT buildvm_arch.h
   COMMAND ${DYNASM} ${DYNASM_FLAGS} -o buildvm_arch.h ${DYNASM_DASC}
-  DEPENDS ${MINILUA} ${DYNASM_DASC} ${DYNASM_DIR}/*.lua
+  DEPENDS ${MINILUA} ${DYNASM_DASC} ${DYNASM_LUA}
   WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}
 )
 
@@ -47,8 +48,9 @@ add_executable(buildvm EXCLUDE_FROM_ALL
   # *sources* list.
   buildvm_arch.h
 )
+file(GLOB DASM_HEADERS ${DYNASM_DIR}/dasm_*.h)
 set_source_files_properties(buildvm.c PROPERTIES
-  OBJECT_DEPENDS ${DYNASM_DIR}/dasm_*.h
+  OBJECT_DEPENDS "${DASM_HEADERS}"
 )
 set_target_properties(buildvm PROPERTIES
   COMPILE_FLAGS "${HOST_C_FLAGS} ${TARGET_C_FLAGS}"
-- 
2.25.1