@@ -9,7 +9,8 @@ macro(extract_definition name output input)
9
9
endmacro ()
10
10
11
11
find_path (TARANTOOL_INCLUDE_DIR tarantool/module.h
12
- HINTS ENV TARANTOOL_DIR
12
+ HINTS ${TARANTOOL_DIR} ENV TARANTOOL_DIR
13
+ PATH_SUFFIXES include
13
14
)
14
15
15
16
if (TARANTOOL_INCLUDE_DIR )
@@ -26,22 +27,14 @@ include(FindPackageHandleStandardArgs)
26
27
find_package_handle_standard_args (TARANTOOL
27
28
REQUIRED_VARS TARANTOOL_INCLUDE_DIR VERSION_VAR TARANTOOL_VERSION )
28
29
if (TARANTOOL_FOUND )
29
- set (TARANTOOL_INSTALL_LIBDIR "${CMAKE_INSTALL_LIBDIR} /tarantool" )
30
- set (TARANTOOL_INSTALL_LUADIR "${CMAKE_INSTALL_DATADIR} /tarantool" )
31
30
set (TARANTOOL_INCLUDE_DIRS "${TARANTOOL_INCLUDE_DIR} "
32
- "${TARANTOOL_INCLUDE_DIR} /tarantool/" )
31
+ "${TARANTOOL_INCLUDE_DIR} /tarantool/"
32
+ CACHE PATH "Include directories for Tarantool" )
33
+ set (TARANTOOL_INSTALL_LIBDIR "${CMAKE_INSTALL_LIBDIR} /tarantool"
34
+ CACHE PATH "Directory for storing Lua modules written in Lua" )
35
+ set (TARANTOOL_INSTALL_LUADIR "${CMAKE_INSTALL_DATADIR} /tarantool"
36
+ CACHE PATH "Directory for storing Lua modules written in C" )
33
37
34
- if (NOT "${CMAKE_INSTALL_PREFIX} " STREQUAL "/usr/local" AND
35
- NOT "${CMAKE_INSTALL_PREFIX} " STREQUAL "${_install_prefix} " )
36
- message (WARNING "Provided CMAKE_INSTALL_PREFIX is different from "
37
- "CMAKE_INSTALL_PREFIX of Tarantool. You might need to set "
38
- "corrent package.path/package.cpath to load this module or "
39
- "change your build prefix:"
40
- "\n "
41
- "cmake . -DCMAKE_INSTALL_PREFIX=${_install_prefix} "
42
- "\n "
43
- )
44
- endif ()
45
38
if (NOT TARANTOOL_FIND_QUIETLY AND NOT FIND_TARANTOOL_DETAILS )
46
39
set (FIND_TARANTOOL_DETAILS ON CACHE INTERNAL "Details about TARANTOOL" )
47
40
message (STATUS "Tarantool LUADIR is ${TARANTOOL_INSTALL_LUADIR} " )
0 commit comments