[Tarantool-patches] [v2][PATCH 1/5] build/ninja: refactoring
Sergey Bronnikov
estetus at gmail.com
Thu Jun 2 16:22:18 MSK 2022
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
More information about the Tarantool-patches
mailing list