Tarantool development patches archive
 help / color / mirror / Atom feed
From: Sergey Bronnikov via Tarantool-patches <tarantool-patches@dev.tarantool.org>
To: tarantool-patches@dev.tarantool.org
Subject: [Tarantool-patches] [v2][PATCH 1/5] build/ninja: refactoring
Date: Thu,  2 Jun 2022 16:22:18 +0300	[thread overview]
Message-ID: <3fea85fae6434748edb5d818ecc9464477c8d02e.1654175362.git.sergeyb@tarantool.org> (raw)
In-Reply-To: <cover.1654175362.git.sergeyb@tarantool.org>

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


  reply	other threads:[~2022-06-02 13:22 UTC|newest]

Thread overview: 22+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2022-06-02 13:22 [Tarantool-patches] [v2][PATCH 0/5] Support building with Ninja Sergey Bronnikov via Tarantool-patches
2022-06-02 13:22 ` Sergey Bronnikov via Tarantool-patches [this message]
2022-06-15  8:56   ` [Tarantool-patches] [v2][PATCH 1/5] build/ninja: refactoring Sergey Kaplun via Tarantool-patches
2022-06-02 13:22 ` [Tarantool-patches] [v2][PATCH 2/5] build/ninja: create target with cli binary only once Sergey Bronnikov via Tarantool-patches
2022-06-15  9:10   ` Sergey Kaplun via Tarantool-patches
2022-06-15 16:03     ` Sergey Bronnikov via Tarantool-patches
2022-06-02 13:22 ` [Tarantool-patches] [v2][PATCH 3/5] build/ninja: rename default target Sergey Bronnikov via Tarantool-patches
2022-06-15  9:11   ` Sergey Kaplun via Tarantool-patches
2022-06-02 13:22 ` [Tarantool-patches] [v2][PATCH 4/5] build/ninja: create file lists outside of cmake commands Sergey Bronnikov via Tarantool-patches
2022-06-15  8:48   ` Igor Munkin via Tarantool-patches
2022-06-15  9:19   ` Sergey Kaplun via Tarantool-patches
2022-06-15 14:31     ` Sergey Bronnikov via Tarantool-patches
2022-06-03 13:29 ` [Tarantool-patches] [v2][PATCH 0/5] Support building with Ninja Sergey Bronnikov via Tarantool-patches
2022-06-06 11:24 ` [Tarantool-patches] [v2][PATCH 5/5] ci: add job with build using Ninja on linux-x86_64 Sergey Bronnikov via Tarantool-patches
2022-06-15  8:48   ` Igor Munkin via Tarantool-patches
2022-06-15  9:27     ` Sergey Kaplun via Tarantool-patches
2022-06-15 14:09       ` Sergey Bronnikov via Tarantool-patches
2022-06-15 14:15     ` Sergey Bronnikov via Tarantool-patches
2022-06-15  8:47 ` [Tarantool-patches] [v2][PATCH 0/5] Support building with Ninja Igor Munkin via Tarantool-patches
2022-06-15 14:57   ` Sergey Bronnikov via Tarantool-patches
2022-06-20 12:48 ` Igor Munkin via Tarantool-patches
2022-06-20 13:04   ` 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=3fea85fae6434748edb5d818ecc9464477c8d02e.1654175362.git.sergeyb@tarantool.org \
    --to=tarantool-patches@dev.tarantool.org \
    --cc=estetus@gmail.com \
    --subject='Re: [Tarantool-patches] [v2][PATCH 1/5] build/ninja: refactoring' \
    /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