Skip to content
Snippets Groups Projects
Commit d6669d1c authored by Georgy Kirichenko's avatar Georgy Kirichenko Committed by Roman Tsisyk
Browse files

Fix lua cpath. Issue #1085

parent 31906195
No related branches found
No related tags found
No related merge requests found
......@@ -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}")
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment