mirror of
https://github.com/neovim/neovim.git
synced 2024-12-27 14:21:31 -07:00
third-party: Build busted in Windows
Busted now builds on Windows, remove the check. In Windows the binary is called busted.bat.
This commit is contained in:
parent
9da4d0dfee
commit
bed61041a0
@ -395,7 +395,7 @@ endif()
|
||||
message(STATUS "Using the Lua interpreter ${LUA_PRG}.")
|
||||
|
||||
# Setup busted.
|
||||
find_program(BUSTED_PRG busted)
|
||||
find_program(BUSTED_PRG NAMES busted busted.bat)
|
||||
find_program(BUSTED_LUA_PRG busted-lua)
|
||||
if(NOT BUSTED_OUTPUT_TYPE)
|
||||
if(WIN32)
|
||||
|
15
third-party/cmake/BuildLuarocks.cmake
vendored
15
third-party/cmake/BuildLuarocks.cmake
vendored
@ -3,11 +3,7 @@
|
||||
# writing a recipe that is meant for cross-compile, use the HOSTDEPS_* variables
|
||||
# instead of DEPS_* - check the main CMakeLists.txt for a list.
|
||||
|
||||
if(MSVC OR (MINGW AND NOT CMAKE_CROSSCOMPILING))
|
||||
message(STATUS "Building busted in Windows is not supported (skipping)")
|
||||
else()
|
||||
option(USE_BUNDLED_BUSTED "Use the bundled version of busted to run tests." ON)
|
||||
endif()
|
||||
option(USE_BUNDLED_BUSTED "Use the bundled version of busted to run tests." ON)
|
||||
|
||||
# BuildLuarocks(CONFIGURE_COMMAND ... BUILD_COMMAND ... INSTALL_COMMAND ...)
|
||||
# Reusable function to build luarocks, wraps ExternalProject_Add.
|
||||
@ -134,12 +130,17 @@ if(USE_BUNDLED_BUSTED)
|
||||
add_custom_target(penlight
|
||||
DEPENDS ${HOSTDEPS_LIB_DIR}/luarocks/rocks/penlight/1.3.2-2)
|
||||
|
||||
add_custom_command(OUTPUT ${HOSTDEPS_BIN_DIR}/busted
|
||||
if(WIN32)
|
||||
set(BUSTED_EXE "${HOSTDEPS_BIN_DIR}/busted.bat")
|
||||
else()
|
||||
set(BUSTED_EXE "${HOSTDEPS_BIN_DIR}/busted")
|
||||
endif()
|
||||
add_custom_command(OUTPUT ${BUSTED_EXE}
|
||||
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 penlight)
|
||||
add_custom_target(busted
|
||||
DEPENDS ${HOSTDEPS_BIN_DIR}/busted)
|
||||
DEPENDS ${BUSTED_EXE})
|
||||
|
||||
add_custom_command(OUTPUT ${HOSTDEPS_BIN_DIR}/luacheck
|
||||
COMMAND ${LUAROCKS_BINARY}
|
||||
|
Loading…
Reference in New Issue
Block a user