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 F3AE76ECE3; Wed, 15 Jun 2022 19:03:07 +0300 (MSK) DKIM-Filter: OpenDKIM Filter v2.11.0 dev.tarantool.org F3AE76ECE3 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=tarantool.org; s=dev; t=1655308988; bh=4uhYKpSpYTGsaxefMlXaZr8aiIzpFe/1AgTDPuWOtvw=; h=Date:To:Cc:References:In-Reply-To:Subject:List-Id: List-Unsubscribe:List-Archive:List-Post:List-Help:List-Subscribe: From:Reply-To:From; b=Ax7M8txb4Fq2ctg9drCmjVyYziL1snX5LLqddIcORe7DKEYOo/FXrRO9vJ0Jce5pa xcjjHhN9mteXV/k64eSKfEQV0PWybjKe0WGxrFItc6Fm1X7ophkdLq9S25JkYJ14LZ YoNZMyVlVwiYIv38qa39PJpE3vkntebMXu/JXY00= Received: from smtp30.i.mail.ru (smtp30.i.mail.ru [94.100.177.90]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by dev.tarantool.org (Postfix) with ESMTPS id 72AE56ECE3 for ; Wed, 15 Jun 2022 19:03:06 +0300 (MSK) DKIM-Filter: OpenDKIM Filter v2.11.0 dev.tarantool.org 72AE56ECE3 Received: by smtp30.i.mail.ru with esmtpa (envelope-from ) id 1o1VU1-0000oB-OO; Wed, 15 Jun 2022 19:03:06 +0300 Message-ID: <3e68b456-cf97-65d5-6eb3-caef4e45ec4d@tarantool.org> Date: Wed, 15 Jun 2022 19:03:04 +0300 MIME-Version: 1.0 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:91.0) Gecko/20100101 Thunderbird/91.9.1 Content-Language: en-US To: Sergey Kaplun , Sergey Bronnikov Cc: tarantool-patches@dev.tarantool.org References: In-Reply-To: Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 7bit X-4EC0790: 10 X-7564579A: 646B95376F6C166E X-77F55803: 4F1203BC0FB41BD97D44297578DBEB86CC0506E018D2C7F54E241DB180169FE4182A05F538085040049AB4EB8C6120C30F533E768332A3C9C0A42098AD737BF262E8CA77016F4FB1 X-7FA49CB5: FF5795518A3D127A4AD6D5ED66289B5278DA827A17800CE7A8325FA649D0A450EA1F7E6F0F101C67BD4B6F7A4D31EC0BCC500DACC3FED6E28638F802B75D45FF8AA50765F790063707C4856229E8E7E48638F802B75D45FF36EB9D2243A4F8B5A6FCA7DBDB1FC311F39EFFDF887939037866D6147AF826D8945BED410E9AD47697175B8FB9F31D45117882F4460429724CE54428C33FAD305F5C1EE8F4F765FC5FC25ED3FCEC3375A471835C12D1D9774AD6D5ED66289B52BA9C0B312567BB23117882F44604297287769387670735201E561CDFBCA1751F618001F51B5FD3F9D2E47CDBA5A96583BA9C0B312567BB2376E601842F6C81A19E625A9149C048EE4B6963042765DA4BBDB03A3F2A65D472D8FC6C240DEA7642DBF02ECDB25306B2B78CF848AE20165D0A6AB1C7CE11FEE39E541A154B51D14BBA3038C0950A5D36B5C8C57E37DE458B0BC6067A898B09E46D1867E19FE14079C09775C1D3CA48CF3D321E7403792E342EB15956EA79C166A417C69337E82CC275ECD9A6C639B01B78DA827A17800CE76515C59FC18CEA6D731C566533BA786AA5CC5B56E945C8DA X-8FC586DF: 6EFBBC1D9D64D975 X-C1DE0DAB: 9604B64F49C60606AD91A466A1DEF99B296C473AB1E14218C6CDE5D1141D2B1C425DCBE880373822B41B0CC06630C226411EE193D60846DCAD91A466A1DEF99B296C473AB1E14218B936CB490224F2464EEA7BD89490CAC0EDDA962BC3F61961 X-C8649E89: 4E36BF7865823D7055A7F0CF078B5EC49A30900B95165D34C6EC1BD9807109D2638D61C636B9AA0E80A34C9A05CE4B2DE7AB3BFAA845E59FB18906EE00E8777F1D7E09C32AA3244C30CF0D0C22A039FE69955AECC74F208F64EE5813BBCA3A9DFACE5A9C96DEB163 X-D57D3AED: 3ZO7eAau8CL7WIMRKs4sN3D3tLDjz0dLbV79QFUyzQ2Ujvy7cMT6pYYqY16iZVKkSc3dCLJ7zSJH7+u4VD18S7Vl4ZUrpaVfd2+vE6kuoey4m4VkSEu530nj6fImhcD4MUrOEAnl0W826KZ9Q+tr5ycPtXkTV4k65bRjmOUUP8cvGozZ33TWg5HZplvhhXbhDGzqmQDTd6OAevLeAnq3Ra9uf7zvY2zzsIhlcp/Y7m53TZgf2aB4JOg4gkr2biojCCvLuneITNrPFvFDMZHTEg== X-Mailru-Sender: C4F68CFF4024C8867DFDF7C7F2588458D3FC9926E9683411F2EB59BEDBAA4A9092A60E6177F098D8282EC151BADDC1D3523A6D01B4765B2DFB59E2DDD9FE06B14FA522850F29BC30B0DAF586E7D11B3E67EA787935ED9F1B X-Mras: Ok Subject: Re: [Tarantool-patches] [v2][PATCH 2/5] build/ninja: create target with cli binary only once 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" Thanks for review! On 15.06.2022 12:10, Sergey Kaplun via Tarantool-patches wrote: > Hi, Sergey! > > Thanks for the patch! > > LGTM, except a few nits below. > > On 02.06.22, Sergey Bronnikov via Tarantool-patches wrote: >> if(NOT BUILDMODE STREQUAL "dynamic") >> set(LIBLUAJIT_STATIC_DEPS libluajit_static) >> set(LUAJIT_DEPS luajit_static) >> + set(LUAJIT_BIN luajit_static) >> + set(LUAJIT_LIB libluajit_static) >> endif() >> if(NOT BUILDMODE STREQUAL "static") >> set(LIBLUAJIT_SHARED_DEPS libluajit_shared) >> set(LUAJIT_DEPS luajit_shared) >> + set(LUAJIT_BIN luajit_shared) >> + set(LUAJIT_LIB libluajit_shared) >> endif() >> set(LIBLUAJIT_DEPS ${LIBLUAJIT_STATIC_DEPS} ${LIBLUAJIT_SHARED_DEPS}) > Nit: Looks like the LUAJIT_DEPS variable duplicates work of > LUAJIT_BIN variable now. Fixed. >> >> +add_executable(${LUAJIT_BIN} EXCLUDE_FROM_ALL ${CLI_SOURCES}) >> +set_target_properties(luajit_shared PROPERTIES >> + OUTPUT_NAME "${LUAJIT_CLI_NAME}" >> + COMPILE_FLAGS "${TARGET_C_FLAGS}" >> + LINK_FLAGS "${TARGET_BIN_FLAGS}" >> + RUNTIME_OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}" >> +) >> +target_include_directories(${LUAJIT_BIN} PRIVATE >> + ${CMAKE_CURRENT_BINARY_DIR} >> +) >> +target_link_libraries(${LUAJIT_BIN} ${LUAJIT_LIB} ${TARGET_LIBS}) >> + >> # XXX: The variable is used in testing, so PARENT_SCOPE option >> # is obligatory. >> set(LUAJIT_BINARY $ PARENT_SCOPE) >> -- >> 2.25.1 >>