From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from [87.239.111.99] (localhost [127.0.0.1]) by dev.tarantool.org (Postfix) with ESMTP id 196416EFDA; Mon, 23 May 2022 15:02:12 +0300 (MSK) DKIM-Filter: OpenDKIM Filter v2.11.0 dev.tarantool.org 196416EFDA DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=tarantool.org; s=dev; t=1653307332; bh=s6saSThl0DIfT72StcyZVrlhajgqgWvDsY+LX1KOGbY=; h=To:Date:In-Reply-To:References:Subject:List-Id:List-Unsubscribe: List-Archive:List-Post:List-Help:List-Subscribe:From:Reply-To: From; b=Y3RzHje4mU+2CcRyMu2K5MWV+uqat33lie1GCfiz9cgq+nccCujDeiXHIeWpuX7jB e0JOyBGdzbMS1Yi31vLUa4zgvoTySog1NgMCGTG0tMcrjDf5j86GNHzIfDNDgPOFtz 32Djk4t8QrUyNfE/RUfe1CnVPFyhKP1ATS+MoGU8= Received: from mail-lf1-f46.google.com (mail-lf1-f46.google.com [209.85.167.46]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by dev.tarantool.org (Postfix) with ESMTPS id B11F46EFDA for ; Mon, 23 May 2022 15:02:10 +0300 (MSK) DKIM-Filter: OpenDKIM Filter v2.11.0 dev.tarantool.org B11F46EFDA Received: by mail-lf1-f46.google.com with SMTP id p4so23757502lfg.4 for ; Mon, 23 May 2022 05:02:10 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=JT3k/erJPFTzuHWhEHWvObcSnI/9NLNhqKNeXDIuMeE=; b=SW/jW+osEKy8h1vUImOsv7SRNoHi5zNLEJ10Usn+J9g5cfQiydTtDf+IcSSXKrH3+x UrVv6d01FcrDEyr/5evsmzF+GlK5HmRva0ZaRnb3YvtFEp50+ATBVZm8RDqzFsWYMFJv auaj3Q56KPY9LRpoyZ9IINejjpUfXCErp9GTPLe0S1rCug4vE2UJ2rbnbsPNaxzjq/e2 U5FrS/jZCUEMajGtDP5T9154dWSrZn2S7GSusFYoLwGcqbE3FjLLO0AdlhztnREak4KQ HrTfUUNcy/VKNy5hG2tbtV9KwXHZsSbh8EMNtWnhHjxvfhqTe7JqTbMi+yogwLQL+tTI 7bPw== X-Gm-Message-State: AOAM530q6RtR4DoPIkSv95f6ZwqrpDEqQ5MhAuzlJNKrTYFQz7HcOGYI 0jIuhaLsZ8Ho07mVnmYuwQW46bbFxM4= X-Google-Smtp-Source: ABdhPJwNz9/GwQL9KV+9juLb2Ff6+mYS1Fvhmo98wt5cWmt2esI7NvRD2awS/4ic6LgS506GW2p7KA== X-Received: by 2002:a05:6512:130c:b0:477:e2ea:396e with SMTP id x12-20020a056512130c00b00477e2ea396emr12299260lfu.489.1653307329818; Mon, 23 May 2022 05:02:09 -0700 (PDT) Received: from pony.mail.msk ([2a00:1148:b0ba:16:57c8:a37f:5705:70e2]) by smtp.gmail.com with ESMTPSA id p20-20020ac24ed4000000b0047255d210easm1943222lfr.25.2022.05.23.05.02.06 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 23 May 2022 05:02:08 -0700 (PDT) X-Google-Original-From: Sergey Bronnikov To: tarantool-patches@dev.tarantool.org Date: Mon, 23 May 2022 15:01:58 +0300 Message-Id: X-Mailer: git-send-email 2.25.1 In-Reply-To: References: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Subject: [Tarantool-patches] [PATCH] build: support build using Ninja X-BeenThere: tarantool-patches@dev.tarantool.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Tarantool development patches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , From: Sergey Bronnikov via Tarantool-patches Reply-To: Sergey Bronnikov Errors-To: tarantool-patches-bounces@dev.tarantool.org Sender: "Tarantool-patches" 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