[Tarantool-patches] [v2][PATCH 2/5] build/ninja: create target with cli binary only once
Sergey Bronnikov
sergeyb at tarantool.org
Wed Jun 15 19:03:04 MSK 2022
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:
<snipped>
>> 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 $<TARGET_FILE:${LUAJIT_DEPS}> PARENT_SCOPE)
>> --
>> 2.25.1
>>
More information about the Tarantool-patches
mailing list