diff options
| author | bfredl <bjorn.linse@gmail.com> | 2023-04-20 13:19:38 +0200 |
|---|---|---|
| committer | bfredl <bjorn.linse@gmail.com> | 2023-04-27 11:40:00 +0200 |
| commit | 45bcf8386918bbb475fbe20c48b508aa89ed0624 (patch) | |
| tree | 772416435a44717c8e42b3d4f59dd85f6ed47bfa /cmake | |
| parent | 9f0762f1fec2aa23df592dda70124e3cbdb703b7 (diff) | |
| download | rneovim-45bcf8386918bbb475fbe20c48b508aa89ed0624.tar.gz rneovim-45bcf8386918bbb475fbe20c48b508aa89ed0624.tar.bz2 rneovim-45bcf8386918bbb475fbe20c48b508aa89ed0624.zip | |
refactor(build): include lpeg as a library
Diffstat (limited to 'cmake')
| -rw-r--r-- | cmake/FindLpeg.cmake | 14 | ||||
| -rw-r--r-- | cmake/LuaHelpers.cmake | 23 |
2 files changed, 14 insertions, 23 deletions
diff --git a/cmake/FindLpeg.cmake b/cmake/FindLpeg.cmake new file mode 100644 index 0000000000..d4fc6dbd97 --- /dev/null +++ b/cmake/FindLpeg.cmake @@ -0,0 +1,14 @@ +find_library(LPEG_LIBRARY NAMES lpeg_a lpeg liblpeg_a) + +# Ubuntu-specific workaround to find system paths +function(ubuntu) + set(CMAKE_FIND_LIBRARY_PREFIXES "") + find_library(LPEG_LIBRARY NAMES lpeg PATH_SUFFIXES lua/5.1) +endfunction() +ubuntu() + +find_package_handle_standard_args(Lpeg DEFAULT_MSG LPEG_LIBRARY) +mark_as_advanced(LPEG_LIBRARY) + +add_library(lpeg INTERFACE) +target_link_libraries(lpeg INTERFACE ${LPEG_LIBRARY}) diff --git a/cmake/LuaHelpers.cmake b/cmake/LuaHelpers.cmake index 0239460f2b..00ecd1357f 100644 --- a/cmake/LuaHelpers.cmake +++ b/cmake/LuaHelpers.cmake @@ -12,26 +12,3 @@ function(check_lua_module LUA_PRG_PATH MODULE RESULT_VAR) set(${RESULT_VAR} True PARENT_SCOPE) endif() endfunction() - -# Check Lua interpreter for dependencies -function(check_lua_deps LUA_PRG_PATH MODULES RESULT_VAR) - # Check if the lua interpreter at the given path - # satisfies all Neovim dependencies - message(STATUS "Checking Lua interpreter: ${LUA_PRG_PATH}") - if(NOT EXISTS ${LUA_PRG_PATH}) - message(STATUS - "[${LUA_PRG_PATH}] file not found") - endif() - - foreach(module ${MODULES}) - check_lua_module(${LUA_PRG_PATH} ${module} has_module) - if(NOT has_module) - message(STATUS - "[${LUA_PRG_PATH}] The '${module}' lua package is required for building Neovim") - set(${RESULT_VAR} False PARENT_SCOPE) - return() - endif() - endforeach() - - set(${RESULT_VAR} True PARENT_SCOPE) -endfunction() |