Open-Harbor/osrm-backend
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 3 Wiki Activity

Add use of LUA_LIBRARY_DIRS, #4646

Browse Source
This commit is contained in:
Michael Krasnyk 2017-10-31 17:06:18 -04:00 committed by Daniel Patterson
parent a68db86dc8
commit eb48945807
1 changed files with 5 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
cmake/FindLua.cmake
View File

@ -84,11 +84,15 @@ function(_lua_set_version_vars)
lua.${CMAKE_MATCH_1}.${CMAKE_MATCH_2} lua.${CMAKE_MATCH_1}.${CMAKE_MATCH_2}
) )
pkg_check_modules(LUA QUIET "lua${ver}") pkg_check_modules(LUA QUIET "lua${ver}")
list(APPEND _lua_include_subdirs ${LUA_INCLUDE_DIRS})
list(APPEND _lua_library_names ${LUA_LIBRARIES})
list(APPEND _lua_library_dirs ${LUA_LIBRARY_DIRS})
endforeach () endforeach ()
set(_lua_include_subdirs "${_lua_include_subdirs}" PARENT_SCOPE) set(_lua_include_subdirs "${_lua_include_subdirs}" PARENT_SCOPE)
set(_lua_library_names "${_lua_library_names}" PARENT_SCOPE) set(_lua_library_names "${_lua_library_names}" PARENT_SCOPE)
set(_lua_append_versions "${_lua_append_versions}" PARENT_SCOPE) set(_lua_append_versions "${_lua_append_versions}" PARENT_SCOPE)
set(_lua_library_dirs "${_lua_library_dirs}" PARENT_SCOPE)
endfunction(_lua_set_version_vars) endfunction(_lua_set_version_vars)
function(_lua_check_header_version _hdr_file) function(_lua_check_header_version _hdr_file)
@ -161,6 +165,7 @@ find_library(LUA_LIBRARY
ENV LUA_DIR ENV LUA_DIR
PATH_SUFFIXES lib PATH_SUFFIXES lib
PATHS PATHS
${_lua_library_dirs}
~/Library/Frameworks ~/Library/Frameworks
/Library/Frameworks /Library/Frameworks
/sw /sw