Skip to content

Commit e33147d

Browse files
cmake: use tt
Tarantool CLI - new modern command line utility for managing Tarantool packages and Tarantool-based applications [1]. It will replace tarantoolctl some day. 1. https://github.com/tarantool/tt
1 parent d703938 commit e33147d

File tree

2 files changed

+15
-2
lines changed

2 files changed

+15
-2
lines changed

CMakeLists.txt

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -77,6 +77,8 @@ add_custom_target(coveralls
7777
## Install ####################################################################
7878
###############################################################################
7979

80+
find_package(TTCtl)
81+
8082
if(NOT DEFINED TARANTOOL_INSTALL_LUADIR)
8183
set(TARANTOOL_INSTALL_LUADIR "${PROJECT_SOURCE_DIR}/.rocks/share/tarantool")
8284
endif()
@@ -99,9 +101,9 @@ install(
99101
# Don't include to rockspec as some Tarantool versions (e.g. 2.2 and 2.3)
100102
# don't have symbols required by "tuple-merger" and "tuple-keydef" modules.
101103
execute_process(
102-
COMMAND bash "-c" "tarantoolctl rocks install tuple-keydef 0.0.2"
104+
COMMAND bash "-c" "${TTCTL} rocks install tuple-keydef 0.0.2"
103105
)
104106

105107
execute_process(
106-
COMMAND bash "-c" "tarantoolctl rocks install tuple-merger 0.0.2"
108+
COMMAND bash "-c" "${TTCTL} rocks install tuple-merger 0.0.2"
107109
)

cmake/FindTTCtl.cmake

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
find_program(TTCTL
2+
NAMES tt tarantoolctl
3+
DOC "Utility for managing Tarantool packages"
4+
)
5+
6+
include(FindPackageHandleStandardArgs)
7+
find_package_handle_standard_args(TTCtl
8+
REQUIRED_VARS TTCTL
9+
)
10+
11+
mark_as_advanced(TTCTL)

0 commit comments

Comments
 (0)