Fix installation from non-root users

Author: rtsisyk

cmake/FindTarantool.cmake

@@ -9,7 +9,7 @@ macro(extract_definition name output input)
 endmacro()
 
 find_path(TARANTOOL_INCLUDE_DIR tarantool/module.h
-  HINTS ENV TARANTOOL_DIR
+  HINTS ENV TARANTOOL_DIR /usr/local/include
 )
 
 if(TARANTOOL_INCLUDE_DIR)
@@ -22,30 +22,18 @@ if(TARANTOOL_INCLUDE_DIR)
     unset(_config)
 endif()
 
-message(STATUS "INCLUDE_DIR ${TARANTOOL_INCLUDE_DIR}")
-message(STATUS "LIBDIR ${CMAKE_INSTALL_LIBDIR}")
-message(STATUS "PREFIX ${_install_prefix}")
-
 include(FindPackageHandleStandardArgs)
 find_package_handle_standard_args(TARANTOOL
     REQUIRED_VARS TARANTOOL_INCLUDE_DIR VERSION_VAR TARANTOOL_VERSION)
 if(TARANTOOL_FOUND)
-    set(TARANTOOL_INSTALL_LIBDIR "${CMAKE_INSTALL_LIBDIR}/tarantool")
-    set(TARANTOOL_INSTALL_LUADIR "${CMAKE_INSTALL_DATADIR}/tarantool")
     set(TARANTOOL_INCLUDE_DIRS "${TARANTOOL_INCLUDE_DIR}"
-                               "${TARANTOOL_INCLUDE_DIR}/tarantool/")
+                               "${TARANTOOL_INCLUDE_DIR}/tarantool/"
+        CACHE PATH "Include directories for Tarantool")
+    set(TARANTOOL_INSTALL_LIBDIR "${CMAKE_INSTALL_LIBDIR}/tarantool"
+        CACHE PATH "Directory for storing Lua modules written in Lua")
+    set(TARANTOOL_INSTALL_LUADIR "${CMAKE_INSTALL_DATADIR}/tarantool"
+        CACHE PATH "Directory for storing Lua modules written in C")
 
-    if (NOT "${CMAKE_INSTALL_PREFIX}" STREQUAL "/usr/local" AND
-            NOT "${CMAKE_INSTALL_PREFIX}" STREQUAL "${_install_prefix}")
-        message(WARNING "Provided CMAKE_INSTALL_PREFIX is different from "
-            "CMAKE_INSTALL_PREFIX of Tarantool. You might need to set "
-            "corrent package.path/package.cpath to load this module or "
-            "change your build prefix:"
-            "\n"
-            "cmake . -DCMAKE_INSTALL_PREFIX=${_install_prefix}"
-            "\n"
-        )
-    endif ()
     if (NOT TARANTOOL_FIND_QUIETLY AND NOT FIND_TARANTOOL_DETAILS)
         set(FIND_TARANTOOL_DETAILS ON CACHE INTERNAL "Details about TARANTOOL")
         message(STATUS "Tarantool LUADIR is ${TARANTOOL_INSTALL_LUADIR}")

mqtt-scm-1.rockspec

@@ -1,25 +1,22 @@
 package = "mqtt"
 version = "scm-1"
 source = {
-	url = "git://github.com/tarantool/mqtt.git",
-	tag = "master"
+    url = "git://github.com/tarantool/mqtt.git",
+    tag = "master"
 }
 description = {
-	summary = "Mqtt connector for Tarantool",
-	homepage = "https://github.com/tarantool/mqtt",
-	license = "MIT"
+    summary = "Mqtt connector for Tarantool",
+    homepage = "https://github.com/tarantool/mqtt",
+    license = "MIT"
 }
 dependencies = {
-	"lua >= 5.1"
-}
-external_dependencies = {
-        TARANTOOL = {
-                header = "tarantool/module.h"
-        },
-	LIBMOSQUITTO = {
-		header = "mosquitto.h"
-	}
+    "lua >= 5.1"
 }
 build = {
-	type = "cmake"
+    type = "cmake";
+    variables = {
+        CMAKE_BUILD_TYPE="RelWithDebInfo";
+        TARANTOOL_INSTALL_LIBDIR="$(LIBDIR)";
+        TARANTOOL_INSTALL_LUADIR="$(LUADIR)";
+    };
 }