mirrors/neovim
1
0
Fork 0
mirror of https://github.com/neovim/neovim.git synced 2025-10-26 12:27:24 +00:00
Code Issues Packages Projects Releases Wiki Activity

deps: Switch lua msgpack library to one that supports 2.0

Browse Source
This commit is contained in:
Thiago de Arruda
2014-09-16 14:12:58 -03:00
parent 31f835adc4
commit ddecfb763b
3 changed files with 13 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
CMakeLists.txt
View File

@@ -94,7 +94,7 @@ set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/bin)
# Find Lua interpreter # Find Lua interpreter
include(LuaHelpers) include(LuaHelpers)
set(LUA_DEPENDENCIES lpeg cmsgpack bit) set(LUA_DEPENDENCIES lpeg MessagePack bit)
if(NOT LUA_PRG) if(NOT LUA_PRG)
foreach(CURRENT_LUA_PRG luajit lua) foreach(CURRENT_LUA_PRG luajit lua)
# If LUA_PRG is set find_program() will not search # If LUA_PRG is set find_program() will not search

2
scripts/msgpack-gen.lua
View File

@@ -1,5 +1,5 @@
lpeg = require('lpeg') lpeg = require('lpeg')
msgpack = require('cmsgpack') msgpack = require('MessagePack')
-- lpeg grammar for building api metadata from a set of header files. It -- lpeg grammar for building api metadata from a set of header files. It
-- ignores comments and preprocessor commands and parses a very small subset -- ignores comments and preprocessor commands and parses a very small subset

21
third-party/CMakeLists.txt vendored
View File

@@ -166,25 +166,26 @@ if(USE_BUNDLED_LUAROCKS)
add_custom_target(busted add_custom_target(busted
DEPENDS ${DEPS_BIN_DIR}/busted) DEPENDS ${DEPS_BIN_DIR}/busted)
# lua-cmsgpack doesn't depend on busted, but luarocks is unhappy to have two # lua-messagepack doesn't depend on busted, but luarocks is unhappy to have
# instances running in parallel. So we depend on busted to force it # two instances running in parallel. So we depend on busted to force it to
# to be serialized. # be serialized.
add_custom_command(OUTPUT ${DEPS_LIB_DIR}/luarocks/rocks/lua-cmsgpack add_custom_command(OUTPUT ${DEPS_LIB_DIR}/luarocks/rocks/lua-messagepack
COMMAND ${DEPS_BIN_DIR}/luarocks COMMAND ${DEPS_BIN_DIR}/luarocks
ARGS build lua-cmsgpack CC=${DEPS_C_COMPILER} LD=${DEPS_C_COMPILER} ARGS build lua-messagepack CC=${DEPS_C_COMPILER} LD=${DEPS_C_COMPILER}
DEPENDS busted) DEPENDS busted)
add_custom_target(lua-cmsgpack add_custom_target(lua-messagepack
DEPENDS ${DEPS_LIB_DIR}/luarocks/rocks/lua-cmsgpack) DEPENDS ${DEPS_LIB_DIR}/luarocks/rocks/lua-messagepack)
# Like before, depend on cmsgpack to ensure serialization of install commands # Like before, depend on lua-messagepack to ensure serialization of install
# commands
add_custom_command(OUTPUT ${DEPS_LIB_DIR}/luarocks/rocks/lpeg add_custom_command(OUTPUT ${DEPS_LIB_DIR}/luarocks/rocks/lpeg
COMMAND ${DEPS_BIN_DIR}/luarocks COMMAND ${DEPS_BIN_DIR}/luarocks
ARGS build lpeg CC=${DEPS_C_COMPILER} LD=${DEPS_C_COMPILER} ARGS build lpeg CC=${DEPS_C_COMPILER} LD=${DEPS_C_COMPILER}
DEPENDS lua-cmsgpack) DEPENDS lua-messagepack)
add_custom_target(lpeg add_custom_target(lpeg
DEPENDS ${DEPS_LIB_DIR}/luarocks/rocks/lpeg) DEPENDS ${DEPS_LIB_DIR}/luarocks/rocks/lpeg)
list(APPEND THIRD_PARTY_DEPS busted lua-cmsgpack lpeg) list(APPEND THIRD_PARTY_DEPS busted lua-messagepack lpeg)
endif() endif()
add_custom_target(third-party ALL add_custom_target(third-party ALL