diff options
| author | Justin M. Keyes <justinkz@gmail.com> | 2015-10-27 14:20:06 -0400 |
|---|---|---|
| committer | Justin M. Keyes <justinkz@gmail.com> | 2015-10-27 14:20:06 -0400 |
| commit | e6525f3ceb861f9c5f7e433a5073f16e8d5babc7 (patch) | |
| tree | fea23f6b148443b9b5ac3bba886d20140ca8d7ac | |
| parent | 68e596856828e61a5fed5a515647509b0cd77100 (diff) | |
| parent | 804edb0489c6c4c861928c3a52ac6aa8580d4f17 (diff) | |
| download | rneovim-e6525f3ceb861f9c5f7e433a5073f16e8d5babc7.tar.gz rneovim-e6525f3ceb861f9c5f7e433a5073f16e8d5babc7.tar.bz2 rneovim-e6525f3ceb861f9c5f7e433a5073f16e8d5babc7.zip | |
Merge pull request #3525 from jszakmeister/fix-busted-dependency
Update busted to pick up the CLI fix.
| -rw-r--r-- | third-party/cmake/BuildLuarocks.cmake | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/third-party/cmake/BuildLuarocks.cmake b/third-party/cmake/BuildLuarocks.cmake index 79d7e83ce7..5910e430b0 100644 --- a/third-party/cmake/BuildLuarocks.cmake +++ b/third-party/cmake/BuildLuarocks.cmake @@ -114,12 +114,18 @@ add_custom_target(lpeg list(APPEND THIRD_PARTY_DEPS lpeg) if(USE_BUNDLED_BUSTED) - add_custom_command(OUTPUT ${HOSTDEPS_BIN_DIR}/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 build https://raw.githubusercontent.com/Olivine-Labs/busted/v2.0.rc10-0/busted-2.0.rc10-0.rockspec ${LUAROCKS_BUILDARGS} + 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) add_custom_target(busted - DEPENDS ${HOSTDEPS_BIN_DIR}/busted) + DEPENDS ${HOSTDEPS_BIN_DIR}/busted ${HOSTDEPS_LIB_DIR}/luarocks/rocks/lua_cliargs) add_custom_command(OUTPUT ${HOSTDEPS_LIB_DIR}/luarocks/rocks/nvim-client COMMAND ${LUAROCKS_BINARY} |