diff options
| -rw-r--r-- | CMakeLists.txt | 2 | ||||
| -rw-r--r-- | scripts/msgpack-gen.lua | 2 | ||||
| -rw-r--r-- | third-party/CMakeLists.txt | 21 |
3 files changed, 13 insertions, 12 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 1043914e8a..cb680da902 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -94,7 +94,7 @@ set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/bin) # Find Lua interpreter include(LuaHelpers) -set(LUA_DEPENDENCIES lpeg cmsgpack bit) +set(LUA_DEPENDENCIES lpeg MessagePack bit) if(NOT LUA_PRG) foreach(CURRENT_LUA_PRG luajit lua) # If LUA_PRG is set find_program() will not search diff --git a/scripts/msgpack-gen.lua b/scripts/msgpack-gen.lua index e2e0d97ac8..916597afda 100644 --- a/scripts/msgpack-gen.lua +++ b/scripts/msgpack-gen.lua @@ -1,5 +1,5 @@ lpeg = require('lpeg') -msgpack = require('cmsgpack') +msgpack = require('MessagePack') -- lpeg grammar for building api metadata from a set of header files. It -- ignores comments and preprocessor commands and parses a very small subset diff --git a/third-party/CMakeLists.txt b/third-party/CMakeLists.txt index c6fc6c5b32..66d43ff7ca 100644 --- a/third-party/CMakeLists.txt +++ b/third-party/CMakeLists.txt @@ -166,25 +166,26 @@ if(USE_BUNDLED_LUAROCKS) add_custom_target(busted DEPENDS ${DEPS_BIN_DIR}/busted) - # lua-cmsgpack doesn't depend on busted, but luarocks is unhappy to have two - # instances running in parallel. So we depend on busted to force it - # to be serialized. - add_custom_command(OUTPUT ${DEPS_LIB_DIR}/luarocks/rocks/lua-cmsgpack + # lua-messagepack doesn't depend on busted, but luarocks is unhappy to have + # two instances running in parallel. So we depend on busted to force it to + # be serialized. + add_custom_command(OUTPUT ${DEPS_LIB_DIR}/luarocks/rocks/lua-messagepack 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) - add_custom_target(lua-cmsgpack - DEPENDS ${DEPS_LIB_DIR}/luarocks/rocks/lua-cmsgpack) + add_custom_target(lua-messagepack + 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 COMMAND ${DEPS_BIN_DIR}/luarocks ARGS build lpeg CC=${DEPS_C_COMPILER} LD=${DEPS_C_COMPILER} - DEPENDS lua-cmsgpack) + DEPENDS lua-messagepack) add_custom_target(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() add_custom_target(third-party ALL |