diff options
| author | Daniel Hahler <git@thequod.de> | 2019-06-24 18:04:57 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-06-24 18:04:57 +0200 |
| commit | 8d4a655ace746c9ad5050b2c37dc5133dcb74fc4 (patch) | |
| tree | 74b62210c21dd01bd41c3a2b2c76e8befa0d1981 /third-party/cmake/BuildLuarocks.cmake | |
| parent | f2e384910029afc12279b56aa212a227a69428bd (diff) | |
| download | rneovim-8d4a655ace746c9ad5050b2c37dc5133dcb74fc4.tar.gz rneovim-8d4a655ace746c9ad5050b2c37dc5133dcb74fc4.tar.bz2 rneovim-8d4a655ace746c9ad5050b2c37dc5133dcb74fc4.zip | |
build: CMake: remove LUAROCKS_VERSION (#10317)
This is not necessary and avoids confusion.
Diffstat (limited to 'third-party/cmake/BuildLuarocks.cmake')
| -rw-r--r-- | third-party/cmake/BuildLuarocks.cmake | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/third-party/cmake/BuildLuarocks.cmake b/third-party/cmake/BuildLuarocks.cmake index 425bb049c8..1f707ddd8a 100644 --- a/third-party/cmake/BuildLuarocks.cmake +++ b/third-party/cmake/BuildLuarocks.cmake @@ -41,9 +41,6 @@ endfunction() # The luarocks binary location set(LUAROCKS_BINARY ${HOSTDEPS_BIN_DIR}/luarocks) -# NOTE: Version must match version of LuaRocks in third-party/CMakeLists.txt -set(LUAROCKS_VERSION 2.4) - # Arguments for calls to 'luarocks build' if(NOT MSVC) # In MSVC don't pass the compiler/linker to luarocks, the bundled @@ -89,14 +86,14 @@ elseif(MSVC OR MINGW) /LUA ${DEPS_INSTALL_DIR} /LIB ${DEPS_LIB_DIR} /BIN ${DEPS_BIN_DIR} - /INC ${DEPS_INSTALL_DIR}/include/luajit-2.0/ - /P ${DEPS_INSTALL_DIR}/${LUAROCKS_VERSION} /TREE ${DEPS_INSTALL_DIR} + /INC ${DEPS_INSTALL_DIR}/include/luajit-2.0 + /P ${DEPS_INSTALL_DIR}/luarocks /TREE ${DEPS_INSTALL_DIR} /SCRIPTS ${DEPS_BIN_DIR} /CMOD ${DEPS_BIN_DIR} ${COMPILER_FLAG} /LUAMOD ${DEPS_BIN_DIR}/lua) - set(LUAROCKS_BINARY ${DEPS_INSTALL_DIR}/${LUAROCKS_VERSION}/luarocks.bat) + set(LUAROCKS_BINARY ${DEPS_INSTALL_DIR}/luarocks/luarocks.bat) else() message(FATAL_ERROR "Trying to build luarocks in an unsupported system ${CMAKE_SYSTEM_NAME}/${CMAKE_C_COMPILER_ID}") endif() |