From 5250ae8f37506c129aa5d18e70b944e9b48b205a Mon Sep 17 00:00:00 2001 From: Ilya Konyukhov Date: Thu, 6 Jun 2019 19:09:28 +0300 Subject: [PATCH] Support FindTarantool to look for nonsystem tarantool If a user have tarantool installed into custom directory he may specify path to tarantool installation using `TARANTOOL_DIR` variable like this: ```bash tarantoolctl rocks TARANTOOL_DIR=/path/to/tarantool/ install kafka ``` Luarocks will bypass this variable to cmake, which will use is to find its header files --- cmake/FindTarantool.cmake | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/cmake/FindTarantool.cmake b/cmake/FindTarantool.cmake index f390960..4551a16 100644 --- a/cmake/FindTarantool.cmake +++ b/cmake/FindTarantool.cmake @@ -9,7 +9,8 @@ macro(extract_definition name output input) endmacro() find_path(TARANTOOL_INCLUDE_DIR tarantool/module.h - HINTS ENV TARANTOOL_DIR /usr/local/include + HINTS ${TARANTOOL_DIR} ENV TARANTOOL_DIR + PATH_SUFFIXES include ) if(TARANTOOL_INCLUDE_DIR)