From 45bcf8386918bbb475fbe20c48b508aa89ed0624 Mon Sep 17 00:00:00 2001 From: bfredl Date: Thu, 20 Apr 2023 13:19:38 +0200 Subject: refactor(build): include lpeg as a library --- cmake/LuaHelpers.cmake | 23 ----------------------- 1 file changed, 23 deletions(-) (limited to 'cmake/LuaHelpers.cmake') 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() -- cgit From 10860164778327c0009f6efc8e020308cadb13a2 Mon Sep 17 00:00:00 2001 From: dundargoc <33953936+dundargoc@users.noreply.github.com> Date: Sat, 13 May 2023 12:12:29 +0200 Subject: build: cmake cleanup - Simplify error checking when using execute_process. - Set BUILD_SHARED_LIBS to OFF when building dependencies. This is normally not needed, but msgpack interprets an unset BUILD_SHARED_LIBS to build a shared library, which is the opposite of the cmake behavior. - Move function check_lua_module to Util.cmake. - Remove unnecessary code. - Make variable naming more consistent --- cmake/LuaHelpers.cmake | 14 -------------- 1 file changed, 14 deletions(-) delete mode 100644 cmake/LuaHelpers.cmake (limited to 'cmake/LuaHelpers.cmake') diff --git a/cmake/LuaHelpers.cmake b/cmake/LuaHelpers.cmake deleted file mode 100644 index 00ecd1357f..0000000000 --- a/cmake/LuaHelpers.cmake +++ /dev/null @@ -1,14 +0,0 @@ -# -# Functions to help checking for a Lua interpreter -# - -# Check if a module is available in Lua -function(check_lua_module LUA_PRG_PATH MODULE RESULT_VAR) - execute_process(COMMAND ${LUA_PRG_PATH} -l "${MODULE}" -e "" - RESULT_VARIABLE module_missing) - if(module_missing) - set(${RESULT_VAR} False PARENT_SCOPE) - else() - set(${RESULT_VAR} True PARENT_SCOPE) - endif() -endfunction() -- cgit