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 CAE3A6EFDB; Thu, 2 Jun 2022 16:22:42 +0300 (MSK) DKIM-Filter: OpenDKIM Filter v2.11.0 dev.tarantool.org CAE3A6EFDB DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=tarantool.org; s=dev; t=1654176162; bh=6uCr2EhPzCMZg9BM+Q6ZZm6qKA5eCXlx9uG74bgzBYY=; 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=DstdC1w6fKQzD6EXyMi8WoMDzWZx0cGN+rHvnURaGI5fy1BIPxa1VSN1SFSIa13IR iThUKjiG1IQpnsFNiCXXDqp3lCfawVv8UGXrdZQvsL1OGccdVbsYEBjdzyJt3eWgKG 52t3nWupkphrWdMnyvXObhtvZ1JGt+beBpICKggo= Received: from mail-lj1-f177.google.com (mail-lj1-f177.google.com [209.85.208.177]) (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 824BB6EFDB for ; Thu, 2 Jun 2022 16:22:21 +0300 (MSK) DKIM-Filter: OpenDKIM Filter v2.11.0 dev.tarantool.org 824BB6EFDB Received: by mail-lj1-f177.google.com with SMTP id q1so5233692ljb.5 for ; Thu, 02 Jun 2022 06:22:21 -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=YODUypLR8iosyMMkhJZ+RUlbZDX3ieN54mBWdJUJDvg=; b=UP0B4o1KvFohYsy/KMV+2MpDEcOcgFYJKFg0CL9hNBqpuXqxjT967KAPQPBbPnFwgd GkKKZL5NVPTCH4frbaRSHBFEwKMeVa6Ht1TZ3e+AGcFibA4AcJL7JYH2rO8gzQcn5YsD Xp3kQ5t/L7CRyxU/atMDB9S9digwvL1M20a9QWobyl1HW+1wfSJUnQm7PlvTX+7S2y4A b2PkU/ihZVn5dFGlGQKlkEJ0+gmBJr1rM9dXD9oHdrb+Bdri+yRpeHTtzu4OXZ0zHDu2 NUjUDijguve/vU4rnCpZdDebORgfgJAIFUCwSMDRyWSygEfVheEDrDw3hnrnHss4zDOs luxw== X-Gm-Message-State: AOAM533Y6cQWu1h5XQ+uE1/XrNASKpjOu6bARjaAnQN/mKJeyS9lE8Ox Qafv56SmJpCSKjks1KRNOxSlArg++a4= X-Google-Smtp-Source: ABdhPJzn74I59m85O+EOYwFDygu1Kc7ggzN5X26/NzhT/VGryC06ngyk+MTeASc06vppiTFqKCWIQw== X-Received: by 2002:a2e:9217:0:b0:255:6b21:990d with SMTP id k23-20020a2e9217000000b002556b21990dmr4953640ljg.324.1654176140710; Thu, 02 Jun 2022 06:22:20 -0700 (PDT) Received: from pony.mail.msk ([2a00:1148:b0ba:16:2894:da3a:9c3f:b06]) by smtp.gmail.com with ESMTPSA id bt20-20020a056512261400b004790e94bcc5sm467618lfb.212.2022.06.02.06.22.19 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 02 Jun 2022 06:22:20 -0700 (PDT) X-Google-Original-From: Sergey Bronnikov To: tarantool-patches@dev.tarantool.org Date: Thu, 2 Jun 2022 16:22:18 +0300 Message-Id: <3fea85fae6434748edb5d818ecc9464477c8d02e.1654175362.git.sergeyb@tarantool.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: References: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Subject: [Tarantool-patches] [v2][PATCH 1/5] build/ninja: refactoring 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" Define variables required for cli binary targets in conditions. Change is needed for the next commit. --- src/CMakeLists.txt | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 1a3f106a..8b651c5a 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -339,17 +339,13 @@ target_link_libraries(luajit_shared libluajit_shared ${TARGET_LIBS}) if(NOT BUILDMODE STREQUAL "dynamic") set(LIBLUAJIT_STATIC_DEPS libluajit_static) + set(LUAJIT_DEPS luajit_static) endif() if(NOT BUILDMODE STREQUAL "static") set(LIBLUAJIT_SHARED_DEPS libluajit_shared) -endif() -set(LIBLUAJIT_DEPS ${LIBLUAJIT_STATIC_DEPS} ${LIBLUAJIT_SHARED_DEPS}) - -if(BUILDMODE STREQUAL "dynamic") set(LUAJIT_DEPS luajit_shared) -else() - set(LUAJIT_DEPS luajit_static) endif() +set(LIBLUAJIT_DEPS ${LIBLUAJIT_STATIC_DEPS} ${LIBLUAJIT_SHARED_DEPS}) # XXX: The variable is used in testing, so PARENT_SCOPE option # is obligatory. -- 2.25.1