aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJohn Szakmeister <john@szakmeister.net>2016-08-15 11:59:09 -0400
committerGitHub <noreply@github.com>2016-08-15 11:59:09 -0400
commitc9b29d3884c380d8de51eb163bbc03cf79a5f886 (patch)
treebf1ebc616dffc523f30fe517793c4018e5d6b664
parente57988a9fb20067e474dda038943ec7573b47415 (diff)
parent1d4506ee172d90d2a931c019dcd8ecca3ed151d1 (diff)
downloadrneovim-c9b29d3884c380d8de51eb163bbc03cf79a5f886.tar.gz
rneovim-c9b29d3884c380d8de51eb163bbc03cf79a5f886.tar.bz2
rneovim-c9b29d3884c380d8de51eb163bbc03cf79a5f886.zip
Merge pull request #5224 from jszakmeister/force-penlight-version
Fix busted tests due to changes in penlight...
-rw-r--r--third-party/cmake/BuildLuarocks.cmake9
1 files changed, 8 insertions, 1 deletions
diff --git a/third-party/cmake/BuildLuarocks.cmake b/third-party/cmake/BuildLuarocks.cmake
index daf39ec271..cbc1959d4f 100644
--- a/third-party/cmake/BuildLuarocks.cmake
+++ b/third-party/cmake/BuildLuarocks.cmake
@@ -127,10 +127,17 @@ add_custom_target(inspect
list(APPEND THIRD_PARTY_DEPS inspect)
if(USE_BUNDLED_BUSTED)
+ add_custom_command(OUTPUT ${HOSTDEPS_LIB_DIR}/luarocks/rocks/penlight/1.3.2-2
+ COMMAND ${LUAROCKS_BINARY}
+ ARGS build penlight 1.3.2-2 ${LUAROCKS_BUILDARGS}
+ DEPENDS inspect)
+ add_custom_target(penlight
+ DEPENDS ${HOSTDEPS_LIB_DIR}/luarocks/rocks/penlight/1.3.2-2)
+
add_custom_command(OUTPUT ${HOSTDEPS_BIN_DIR}/busted
COMMAND ${LUAROCKS_BINARY}
ARGS build https://raw.githubusercontent.com/Olivine-Labs/busted/v2.0.rc11-0/busted-2.0.rc11-0.rockspec ${LUAROCKS_BUILDARGS}
- DEPENDS lpeg)
+ DEPENDS penlight)
add_custom_target(busted
DEPENDS ${HOSTDEPS_BIN_DIR}/busted)