From 88366641ad8a11bd428a91b9b294fe53ef1a71b7 Mon Sep 17 00:00:00 2001 From: dundargoc <33953936+dundargoc@users.noreply.github.com> Date: Mon, 8 May 2023 17:24:19 +0200 Subject: [PATCH] build: remove USE_BUNDLED_BUSTED option The previous logic made it possible to install bundled luarocks, but also use external rocks, making the luarocks installation unnecessary. Instead, let's assume that if the user wants to use the bundled luarocks, then they also want to use it to install necessary rocks. --- cmake.deps/cmake/BuildLuarocks.cmake | 30 ++++++++++++---------------- 1 file changed, 13 insertions(+), 17 deletions(-) diff --git a/cmake.deps/cmake/BuildLuarocks.cmake b/cmake.deps/cmake/BuildLuarocks.cmake index cb29ed9d95..d45776f5b1 100644 --- a/cmake.deps/cmake/BuildLuarocks.cmake +++ b/cmake.deps/cmake/BuildLuarocks.cmake @@ -3,8 +3,6 @@ # running luarocks in parallel will break, e.g. when some rocks have # the same dependency. -option(USE_BUNDLED_BUSTED "Use the bundled version of busted to run tests." ON) - # The luarocks binary location set(LUAROCKS_BINARY ${DEPS_BIN_DIR}/luarocks) @@ -119,19 +117,17 @@ function(Download ROCK VER) set(CURRENT_DEP ${ROCK} PARENT_SCOPE) endfunction() -if(USE_BUNDLED_BUSTED) - if(WIN32) - set(BUSTED_EXE "${DEPS_BIN_DIR}/busted.bat") - set(LUACHECK_EXE "${DEPS_BIN_DIR}/luacheck.bat") - else() - set(BUSTED_EXE "${DEPS_BIN_DIR}/busted") - set(LUACHECK_EXE "${DEPS_BIN_DIR}/luacheck") - endif() - - Download(busted 2.1.1 ${BUSTED_EXE}) - Download(luacheck 1.1.0-1 ${LUACHECK_EXE}) - - if (USE_BUNDLED_LUA OR NOT USE_BUNDLED_LUAJIT) - Download(coxpcall 1.17.0-1) - endif() +if(WIN32) + set(BUSTED_EXE "${DEPS_BIN_DIR}/busted.bat") + set(LUACHECK_EXE "${DEPS_BIN_DIR}/luacheck.bat") +else() + set(BUSTED_EXE "${DEPS_BIN_DIR}/busted") + set(LUACHECK_EXE "${DEPS_BIN_DIR}/luacheck") +endif() + +Download(busted 2.1.1 ${BUSTED_EXE}) +Download(luacheck 1.1.0-1 ${LUACHECK_EXE}) + +if (USE_BUNDLED_LUA OR NOT USE_BUNDLED_LUAJIT) + Download(coxpcall 1.17.0-1) endif()