diff options
| author | bfredl <bjorn.linse@gmail.com> | 2023-02-10 20:51:36 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-02-10 20:51:36 +0100 |
| commit | b8ad1bfe8bc23ed5ffbfe43df5fda3501f1d2802 (patch) | |
| tree | ea341bee19c2202cbe94ccefb2afeba953af713e /cmake.deps | |
| parent | 4c64cbe99f2616a1d1126257da8d40773f4adba1 (diff) | |
| parent | 0837980db4958baca96449869d31120f349f3500 (diff) | |
| download | rneovim-b8ad1bfe8bc23ed5ffbfe43df5fda3501f1d2802.tar.gz rneovim-b8ad1bfe8bc23ed5ffbfe43df5fda3501f1d2802.tar.bz2 rneovim-b8ad1bfe8bc23ed5ffbfe43df5fda3501f1d2802.zip | |
Merge pull request #22077 from bfredl/neolua_client
refactor(tests): integrate lua-client into core and use core for functionaltests
Diffstat (limited to 'cmake.deps')
| -rw-r--r-- | cmake.deps/cmake/BuildLuarocks.cmake | 25 |
1 files changed, 8 insertions, 17 deletions
diff --git a/cmake.deps/cmake/BuildLuarocks.cmake b/cmake.deps/cmake/BuildLuarocks.cmake index b84ce34d45..e50f50798a 100644 --- a/cmake.deps/cmake/BuildLuarocks.cmake +++ b/cmake.deps/cmake/BuildLuarocks.cmake @@ -158,23 +158,14 @@ if(USE_BUNDLED_BUSTED) DEPENDS busted) add_custom_target(luacheck DEPENDS ${LUACHECK_EXE}) - # luv - set(LUV_DEPS luacheck) - if(USE_BUNDLED_LUV) - set(NVIM_CLIENT_DEPS luacheck luv-static lua-compat-5.3) - else() - add_custom_command(OUTPUT ${ROCKS_DIR}/luv - COMMAND ${LUAROCKS_BINARY} build luv ${LUV_VERSION} ${LUAROCKS_BUILDARGS} - DEPENDS luacheck) - add_custom_target(luv DEPENDS ${ROCKS_DIR}/luv) - set(NVIM_CLIENT_DEPS luv) + if (NOT USE_BUNDLED_LUAJIT) + # coxpcall + add_custom_command(OUTPUT ${ROCKS_DIR}/coxpcall + COMMAND ${LUAROCKS_BINARY} build coxpcall 1.16.0-1 ${LUAROCKS_BUILDARGS} + DEPENDS luarocks) + add_custom_target(coxpcall DEPENDS ${ROCKS_DIR}/coxpcall) + list(APPEND THIRD_PARTY_DEPS coxpcall) endif() - # nvim-client: https://github.com/neovim/lua-client - add_custom_command(OUTPUT ${ROCKS_DIR}/nvim-client - COMMAND ${LUAROCKS_BINARY} build nvim-client 0.2.4-1 ${LUAROCKS_BUILDARGS} - DEPENDS ${NVIM_CLIENT_DEPS}) - add_custom_target(nvim-client DEPENDS ${ROCKS_DIR}/nvim-client) - - list(APPEND THIRD_PARTY_DEPS busted luacheck nvim-client) + list(APPEND THIRD_PARTY_DEPS busted luacheck) endif() |