diff options
| author | James McCoy <jamessan@jamessan.com> | 2018-02-01 09:23:33 -0500 |
|---|---|---|
| committer | James McCoy <jamessan@jamessan.com> | 2018-02-02 07:28:55 -0500 |
| commit | 204ec6337e91df9b79a3b3a36dda99baf95147ca (patch) | |
| tree | e877db21fbc51dc9eea7f641ac6456223b9224ec /third-party/cmake/BuildLuarocks.cmake | |
| parent | 4487657576e30e75d46409544f8a76a761ab3d70 (diff) | |
| download | rneovim-204ec6337e91df9b79a3b3a36dda99baf95147ca.tar.gz rneovim-204ec6337e91df9b79a3b3a36dda99baf95147ca.tar.bz2 rneovim-204ec6337e91df9b79a3b3a36dda99baf95147ca.zip | |
third-party: luarocks: Use Lua if LuaJIT is disabled
Diffstat (limited to 'third-party/cmake/BuildLuarocks.cmake')
| -rw-r--r-- | third-party/cmake/BuildLuarocks.cmake | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/third-party/cmake/BuildLuarocks.cmake b/third-party/cmake/BuildLuarocks.cmake index 1343948d36..08a965de43 100644 --- a/third-party/cmake/BuildLuarocks.cmake +++ b/third-party/cmake/BuildLuarocks.cmake @@ -56,13 +56,16 @@ if(UNIX OR (MINGW AND CMAKE_CROSSCOMPILING)) if(USE_BUNDLED_LUAJIT) list(APPEND LUAROCKS_OPTS --with-lua=${HOSTDEPS_INSTALL_DIR} - --with-lua-include=${HOSTDEPS_INSTALL_DIR}/include/luajit-2.0) + --with-lua-include=${HOSTDEPS_INSTALL_DIR}/include/luajit-2.0 + --lua-suffix=jit) + elseif(USE_BUNDLED_LUA) + list(APPEND LUAROCKS_OPTS + --with-lua=${HOSTDEPS_INSTALL_DIR}) endif() BuildLuarocks( CONFIGURE_COMMAND ${DEPS_BUILD_DIR}/src/luarocks/configure --prefix=${HOSTDEPS_INSTALL_DIR} --force-config ${LUAROCKS_OPTS} - --lua-suffix=jit INSTALL_COMMAND ${MAKE_PRG} bootstrap) elseif(MSVC OR MINGW) @@ -94,6 +97,8 @@ if(USE_BUNDLED_LUAJIT) if(MINGW AND CMAKE_CROSSCOMPILING) add_dependencies(luarocks luajit_host) endif() +elseif(USE_BUNDLED_LUA) + add_dependencies(luarocks lua) endif() # DEPENDS on the previous module, because Luarocks breaks if parallel. |