From d6669d1cccf83bc64c69b9a1480234b209910e7b Mon Sep 17 00:00:00 2001
From: Georgy Kirichenko <kirichenkoga@gmail.com>
Date: Thu, 21 Jan 2016 23:35:20 +0300
Subject: [PATCH] Fix lua cpath. Issue #1085
---
CMakeLists.txt | 22 ++++++++++++++++++++++
1 file changed, 22 insertions(+)
diff --git a/CMakeLists.txt b/CMakeLists.txt
index fd01f90fd3..f8588b87f7 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -208,7 +208,29 @@ endforeach()
list(APPEND MODULE_LUAPATH "${MODULE_FULL_LUADIR}/?.lua")
list(APPEND MODULE_LUAPATH "${MODULE_FULL_LUADIR}/?/init.lua")
+foreach(dir
+ "lua/luarocks/share/lua/5.1"
+ "lua/5.1")
+ list(APPEND MODULE_LUAPATH "/usr/${CMAKE_INSTALL_LIBDIR}/${dir}/?.lua")
+ list(APPEND MODULE_LUAPATH "/usr/${CMAKE_INSTALL_LIBDIR}/${dir}/?/init.lua")
+endforeach()
+
list(APPEND MODULE_LIBPATH "${MODULE_FULL_LIBDIR}/?${CMAKE_SHARED_MODULE_SUFFIX}")
+if (NOT ${CMAKE_INSTALL_PREFIX} STREQUAL "/usr" AND
+ NOT ${CMAKE_INSTALL_PREFIX} STREQUAL "/usr/local")
+ list(APPEND MODULE_LIBPATH "${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_LIBDIR}")
+endif()
+
+foreach(dir
+ "/usr/local"
+ "/usr")
+ foreach(lua_lib
+ "lua/luarocks/lib/lua/5.1"
+ "lua/5.1")
+ list(APPEND MODULE_LIBPATH
+ "${dir}/${CMAKE_INSTALL_LIBDIR}/${lua_lib}/?${CMAKE_SHARED_MODULE_SUFFIX}")
+ endforeach()
+endforeach()
find_package_message(MODULE_LUAPATH "Lua package.path: ${MODULE_LUAPATH}"
"${MODULE_LUAPATH}")
--
GitLab