diff options
| author | James McCoy <jamessan@jamessan.com> | 2018-02-04 07:54:30 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-02-04 07:54:30 -0500 |
| commit | 0851057a8deaa1197bd0af22babb62c1146d836c (patch) | |
| tree | a6f796181ed7b76b470d6ce0fbb2df0a836fccae /third-party/cmake/BuildLua.cmake | |
| parent | e2afcfb020fa16b465dd25d3455cd00487e68915 (diff) | |
| parent | de10ea55f370cd57b79d23c2ae09bebf154a0f1a (diff) | |
| download | rneovim-0851057a8deaa1197bd0af22babb62c1146d836c.tar.gz rneovim-0851057a8deaa1197bd0af22babb62c1146d836c.tar.bz2 rneovim-0851057a8deaa1197bd0af22babb62c1146d836c.zip | |
Merge pull request #7957 from jamessan/lua-functionaltest
[RFC] Ensure build works without LuaJIT available
Diffstat (limited to 'third-party/cmake/BuildLua.cmake')
| -rw-r--r-- | third-party/cmake/BuildLua.cmake | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/third-party/cmake/BuildLua.cmake b/third-party/cmake/BuildLua.cmake index ea1371d1d5..da617e3ccd 100644 --- a/third-party/cmake/BuildLua.cmake +++ b/third-party/cmake/BuildLua.cmake @@ -71,6 +71,7 @@ set(LUA_CONFIGURE_COMMAND -e "s@-lncurses@@g" -i ${DEPS_BUILD_DIR}/src/lua/src/Makefile && sed -e "/#define LUA_USE_READLINE/d" + -e "s@\\(#define LUA_ROOT[ ]*\"\\)/usr/local@\\1${DEPS_INSTALL_DIR}@" -i ${DEPS_BUILD_DIR}/src/lua/src/luaconf.h) set(LUA_INSTALL_TOP_ARG "INSTALL_TOP=${DEPS_INSTALL_DIR}") set(LUA_BUILD_COMMAND @@ -84,14 +85,13 @@ BuildLua(CONFIGURE_COMMAND ${LUA_CONFIGURE_COMMAND} BUILD_COMMAND ${LUA_BUILD_COMMAND} INSTALL_COMMAND ${LUA_INSTALL_COMMAND}) list(APPEND THIRD_PARTY_DEPS lua) -add_dependencies(lua busted) set(BUSTED ${DEPS_INSTALL_DIR}/bin/busted) set(BUSTED_LUA ${BUSTED}-lua) add_custom_command(OUTPUT ${BUSTED_LUA} COMMAND sed -e 's/^exec/exec $$LUA_DEBUGGER/' -e 's/jit//g' < ${BUSTED} > ${BUSTED_LUA} && chmod +x ${BUSTED_LUA} - DEPENDS lua) + DEPENDS lua busted) add_custom_target(busted-lua DEPENDS ${DEPS_INSTALL_DIR}/bin/busted-lua) |