diff options
| author | George Zhao <zhaozg@gmail.com> | 2018-01-24 17:29:30 +0800 |
|---|---|---|
| committer | Justin M. Keyes <justinkz@gmail.com> | 2018-01-24 10:29:30 +0100 |
| commit | a3daa8cb136c83c2fc0e5c9283cde1f7a8ce246c (patch) | |
| tree | 51396614a61eef55d378c0f7c5e1db1339c1b6df | |
| parent | 15119f943ab8c2d089f45969da06b6b58b4d0036 (diff) | |
| download | rneovim-a3daa8cb136c83c2fc0e5c9283cde1f7a8ce246c.tar.gz rneovim-a3daa8cb136c83c2fc0e5c9283cde1f7a8ce246c.tar.bz2 rneovim-a3daa8cb136c83c2fc0e5c9283cde1f7a8ce246c.zip | |
build: fix luacheck detection (avoids re-download on win32) (#7905)
| -rw-r--r-- | third-party/cmake/BuildLuarocks.cmake | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/third-party/cmake/BuildLuarocks.cmake b/third-party/cmake/BuildLuarocks.cmake index c7b7f8d837..7673959392 100644 --- a/third-party/cmake/BuildLuarocks.cmake +++ b/third-party/cmake/BuildLuarocks.cmake @@ -136,8 +136,10 @@ if(USE_BUNDLED_BUSTED) if(WIN32) set(BUSTED_EXE "${HOSTDEPS_BIN_DIR}/busted.bat") + set(LUACHECK_EXE "${HOSTDEPS_BIN_DIR}/luacheck.bat") else() set(BUSTED_EXE "${HOSTDEPS_BIN_DIR}/busted") + set(LUACHECK_EXE "${HOSTDEPS_BIN_DIR}/luacheck") endif() # DEPENDS on the previous module, because Luarocks breaks if parallel. add_custom_command(OUTPUT ${BUSTED_EXE} @@ -148,12 +150,12 @@ if(USE_BUNDLED_BUSTED) DEPENDS ${BUSTED_EXE}) # DEPENDS on the previous module, because Luarocks breaks if parallel. - add_custom_command(OUTPUT ${HOSTDEPS_BIN_DIR}/luacheck + add_custom_command(OUTPUT ${LUACHECK_EXE} COMMAND ${LUAROCKS_BINARY} ARGS build https://raw.githubusercontent.com/mpeterv/luacheck/master/luacheck-scm-1.rockspec ${LUAROCKS_BUILDARGS} DEPENDS busted) add_custom_target(luacheck - DEPENDS ${HOSTDEPS_BIN_DIR}/luacheck) + DEPENDS ${LUACHECK_EXE}) set(LUV_DEPS luacheck luv-static) if(MINGW AND CMAKE_CROSSCOMPILING) |