From: Sergey Bronnikov via Tarantool-patches <tarantool-patches@dev.tarantool.org> To: tarantool-patches@dev.tarantool.org Subject: [Tarantool-patches] [PATCH] build: support build using Ninja Date: Mon, 23 May 2022 15:01:58 +0300 [thread overview] Message-ID: <ee1a1146963fe6aad5bff59884e00b6cf24eaf1a.1653307030.git.sergeyb@tarantool.org> (raw) In-Reply-To: <n> 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
next reply other threads:[~2022-05-23 12:02 UTC|newest] Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top 2022-05-23 12:01 Sergey Bronnikov via Tarantool-patches [this message] 2022-05-26 16:21 ` Igor Munkin via Tarantool-patches 2022-06-02 13:21 ` Sergey Bronnikov via Tarantool-patches
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=ee1a1146963fe6aad5bff59884e00b6cf24eaf1a.1653307030.git.sergeyb@tarantool.org \ --to=tarantool-patches@dev.tarantool.org \ --cc=estetus@gmail.com \ --subject='Re: [Tarantool-patches] [PATCH] build: support build using Ninja' \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: link
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox