diff options
| author | Daniel Hahler <git@thequod.de> | 2019-06-23 04:17:13 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-06-23 04:17:13 +0200 |
| commit | de2e51439ec96f0ec4063f5b516258f1c72e69cd (patch) | |
| tree | 7070c4faee39035956e432ef227df29edcdd5ea0 | |
| parent | 098fd362355c3895d8c23894f901834eb4c5f9e4 (diff) | |
| download | rneovim-de2e51439ec96f0ec4063f5b516258f1c72e69cd.tar.gz rneovim-de2e51439ec96f0ec4063f5b516258f1c72e69cd.tar.bz2 rneovim-de2e51439ec96f0ec4063f5b516258f1c72e69cd.zip | |
build: tests: build luv rock also with USE_BUNDLED_LUV=0 (#10307)
Followup to https://github.com/neovim/neovim/pull/10291
Ref: https://github.com/neovim/neovim/issues/10289
| -rw-r--r-- | third-party/CMakeLists.txt | 3 | ||||
| -rw-r--r-- | third-party/cmake/BuildLuarocks.cmake | 20 |
2 files changed, 13 insertions, 10 deletions
diff --git a/third-party/CMakeLists.txt b/third-party/CMakeLists.txt index 21a1752054..c9e8537272 100644 --- a/third-party/CMakeLists.txt +++ b/third-party/CMakeLists.txt @@ -154,7 +154,8 @@ set(LIBTERMKEY_SHA256 cecbf737f35d18f433c8d7864f63c0f878af41f8bd0255a3ebb16010dc set(LIBVTERM_URL https://github.com/neovim/libvterm/archive/b45b648cab73f9667bde7c0c6045b285e22b3ecd.tar.gz) set(LIBVTERM_SHA256 37cc123deff29327efa654358c2ebaaf8589da03754ca5adb8ec47be386a0433) -set(LUV_URL https://github.com/luvit/luv/archive/1.29.1-2.tar.gz) +set(LUV_VERSION 1.29.1-2) +set(LUV_URL https://github.com/luvit/luv/archive/${LUV_VERSION}.tar.gz) set(LUV_SHA256 e75d8fd2a14433bb798900a71e45318b3c0b8c2ef2c1c43593482ce95b4999e2) set(LUA_COMPAT53_URL https://github.com/keplerproject/lua-compat-5.3/archive/v0.7.tar.gz) diff --git a/third-party/cmake/BuildLuarocks.cmake b/third-party/cmake/BuildLuarocks.cmake index bebfc83bfe..140c50ba0d 100644 --- a/third-party/cmake/BuildLuarocks.cmake +++ b/third-party/cmake/BuildLuarocks.cmake @@ -181,36 +181,38 @@ if(USE_BUNDLED_BUSTED) DEPENDS busted) add_custom_target(luacheck DEPENDS ${LUACHECK_EXE}) - set(nvim_client_depends luacheck) + # DEPENDS on the previous module, because Luarocks breaks if parallel. + set(LUV_DEPS luacheck) if(USE_BUNDLED_LUV) - set(LUV_DEPS luacheck luv-static lua-compat-5.3) + list(APPEND LUV_DEPS luv-static lua-compat-5.3) if(MINGW AND CMAKE_CROSSCOMPILING) - set(LUV_DEPS ${LUV_DEPS} libuv_host) + list(APPEND LUV_DEPS libuv_host) endif() set(LUV_ARGS "CFLAGS=-O0 -g3 -fPIC") if(USE_BUNDLED_LIBUV) list(APPEND LUV_ARGS LIBUV_DIR=${HOSTDEPS_INSTALL_DIR}) endif() - # DEPENDS on the previous module, because Luarocks breaks if parallel. SET(LUV_PRIVATE_ARGS LUA_COMPAT53_INCDIR=${DEPS_BUILD_DIR}/src/lua-compat-5.3) add_custom_command(OUTPUT ${HOSTDEPS_LIB_DIR}/luarocks/rocks/luv COMMAND ${LUAROCKS_BINARY} ARGS make ${LUAROCKS_BUILDARGS} ${LUV_ARGS} ${LUV_PRIVATE_ARGS} WORKING_DIRECTORY ${DEPS_BUILD_DIR}/src/luv DEPENDS ${LUV_DEPS}) - add_custom_target(luv - DEPENDS ${HOSTDEPS_LIB_DIR}/luarocks/rocks/luv) - set(nvim_client_depends luv) else() - set(nvim_client_depends luacheck) + add_custom_command(OUTPUT ${HOSTDEPS_LIB_DIR}/luarocks/rocks/luv + COMMAND ${LUAROCKS_BINARY} + ARGS build luv ${LUV_VERSION} ${LUAROCKS_BUILDARGS} + DEPENDS ${LUV_DEPS}) endif() + add_custom_target(luv + DEPENDS ${HOSTDEPS_LIB_DIR}/luarocks/rocks/luv) # DEPENDS on the previous module, because Luarocks breaks if parallel. add_custom_command(OUTPUT ${HOSTDEPS_LIB_DIR}/luarocks/rocks/nvim-client COMMAND ${LUAROCKS_BINARY} ARGS build nvim-client 0.2.0-1 ${LUAROCKS_BUILDARGS} - DEPENDS ${nvim_client_depends}) + DEPENDS luv) add_custom_target(nvim-client DEPENDS ${HOSTDEPS_LIB_DIR}/luarocks/rocks/nvim-client) |