diff options
| author | Justin M. Keyes <justinkz@gmail.com> | 2015-10-28 08:26:14 -0400 |
|---|---|---|
| committer | Justin M. Keyes <justinkz@gmail.com> | 2015-10-28 08:26:14 -0400 |
| commit | 454b087dda1911b2523f48e03a9ea667ed14f806 (patch) | |
| tree | de03f7405917b85bdaecc6ab4469986af580fe7f | |
| parent | 2394a1aeeeada108a83a11a2b890baf53fa461e5 (diff) | |
| parent | e34ae35d102d7bad4e4939f7736da84a31302c94 (diff) | |
| download | rneovim-454b087dda1911b2523f48e03a9ea667ed14f806.tar.gz rneovim-454b087dda1911b2523f48e03a9ea667ed14f806.tar.bz2 rneovim-454b087dda1911b2523f48e03a9ea667ed14f806.zip | |
Merge pull request #3539 from jszakmeister/js/use-updated-busted
Remove our cliargs workaround use 2.0.rc11 of Busted.
| -rw-r--r-- | third-party/cmake/BuildLuarocks.cmake | 10 |
1 files changed, 3 insertions, 7 deletions
diff --git a/third-party/cmake/BuildLuarocks.cmake b/third-party/cmake/BuildLuarocks.cmake index 5910e430b0..cb38b3b6cc 100644 --- a/third-party/cmake/BuildLuarocks.cmake +++ b/third-party/cmake/BuildLuarocks.cmake @@ -116,16 +116,12 @@ list(APPEND THIRD_PARTY_DEPS lpeg) if(USE_BUNDLED_BUSTED) # We can remove the cliargs dependency once the busted version dependency # is fixed. - add_custom_command(OUTPUT ${HOSTDEPS_LIB_DIR}/luarocks/rocks/lua_cliargs - COMMAND ${LUAROCKS_BINARY} - ARGS install lua_cliargs 2.5-4 - DEPENDS luarocks) add_custom_command(OUTPUT ${HOSTDEPS_BIN_DIR}/busted COMMAND ${LUAROCKS_BINARY} - ARGS build https://raw.githubusercontent.com/Olivine-Labs/busted/v2.0.rc10-1/busted-2.0.rc10-1.rockspec ${LUAROCKS_BUILDARGS} - DEPENDS luarocks ${HOSTDEPS_LIB_DIR}/luarocks/rocks/lua_cliargs) + ARGS build https://raw.githubusercontent.com/Olivine-Labs/busted/v2.0.rc11-0/busted-2.0.rc11-0.rockspec ${LUAROCKS_BUILDARGS} + DEPENDS luarocks) add_custom_target(busted - DEPENDS ${HOSTDEPS_BIN_DIR}/busted ${HOSTDEPS_LIB_DIR}/luarocks/rocks/lua_cliargs) + DEPENDS ${HOSTDEPS_BIN_DIR}/busted) add_custom_command(OUTPUT ${HOSTDEPS_LIB_DIR}/luarocks/rocks/nvim-client COMMAND ${LUAROCKS_BINARY} |