1 files changed, 17 insertions, 40 deletions
diff --git a/cmake.deps/cmake/BuildLua.cmake b/cmake.deps/cmake/BuildLua.cmake
index a40cb7dcb2..58131a4ba7 100644
--- a/cmake.deps/cmake/BuildLua.cmake
+++ b/cmake.deps/cmake/BuildLua.cmake
@@ -1,36 +1,3 @@
-# BuildLua(CONFIGURE_COMMAND ... BUILD_COMMAND ... INSTALL_COMMAND ...)
-# Reusable function to build lua, wraps ExternalProject_Add.
-# Failing to pass a command argument will result in no command being run
-function(BuildLua)
-  cmake_parse_arguments(_lua
-    ""
-    ""
-    "CONFIGURE_COMMAND;BUILD_COMMAND;INSTALL_COMMAND"
-    ${ARGN})
-
-  if(NOT _lua_CONFIGURE_COMMAND AND NOT _lua_BUILD_COMMAND
-       AND NOT _lua_INSTALL_COMMAND)
-    message(FATAL_ERROR "Must pass at least one of CONFIGURE_COMMAND, BUILD_COMMAND, INSTALL_COMMAND")
-  endif()
-
-  ExternalProject_Add(lua
-    PREFIX ${DEPS_BUILD_DIR}
-    URL ${LUA_URL}
-    DOWNLOAD_DIR ${DEPS_DOWNLOAD_DIR}/lua
-    DOWNLOAD_COMMAND ${CMAKE_COMMAND}
-      -DPREFIX=${DEPS_BUILD_DIR}
-      -DDOWNLOAD_DIR=${DEPS_DOWNLOAD_DIR}/lua
-      -DURL=${LUA_URL}
-      -DEXPECTED_SHA256=${LUA_SHA256}
-      -DTARGET=lua
-      -DUSE_EXISTING_SRC_DIR=${USE_EXISTING_SRC_DIR}
-      -P ${CMAKE_CURRENT_SOURCE_DIR}/cmake/DownloadAndExtractFile.cmake
-    CONFIGURE_COMMAND "${_lua_CONFIGURE_COMMAND}"
-    BUILD_IN_SOURCE 1
-    BUILD_COMMAND "${_lua_BUILD_COMMAND}"
-    INSTALL_COMMAND "${_lua_INSTALL_COMMAND}")
-endfunction()
-
 if(CMAKE_SYSTEM_NAME STREQUAL "Linux")
   set(LUA_TARGET linux)
 elseif(CMAKE_SYSTEM_NAME STREQUAL "Darwin")
@@ -72,16 +39,26 @@ set(LUA_CONFIGURE_COMMAND
       -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
-    ${MAKE_PRG} ${LUA_INSTALL_TOP_ARG} ${LUA_TARGET})
-set(LUA_INSTALL_COMMAND
-    ${MAKE_PRG} ${LUA_INSTALL_TOP_ARG} install)
 
 message(STATUS "Lua target is ${LUA_TARGET}")
 
-BuildLua(CONFIGURE_COMMAND ${LUA_CONFIGURE_COMMAND}
-  BUILD_COMMAND ${LUA_BUILD_COMMAND}
-  INSTALL_COMMAND ${LUA_INSTALL_COMMAND})
+ExternalProject_Add(lua
+  PREFIX ${DEPS_BUILD_DIR}
+  URL ${LUA_URL}
+  DOWNLOAD_DIR ${DEPS_DOWNLOAD_DIR}/lua
+  DOWNLOAD_COMMAND ${CMAKE_COMMAND}
+    -DPREFIX=${DEPS_BUILD_DIR}
+    -DDOWNLOAD_DIR=${DEPS_DOWNLOAD_DIR}/lua
+    -DURL=${LUA_URL}
+    -DEXPECTED_SHA256=${LUA_SHA256}
+    -DTARGET=lua
+    -DUSE_EXISTING_SRC_DIR=${USE_EXISTING_SRC_DIR}
+    -P ${CMAKE_CURRENT_SOURCE_DIR}/cmake/DownloadAndExtractFile.cmake
+  CONFIGURE_COMMAND "${LUA_CONFIGURE_COMMAND}"
+  BUILD_IN_SOURCE 1
+  BUILD_COMMAND ${MAKE_PRG} ${LUA_INSTALL_TOP_ARG} ${LUA_TARGET}
+  INSTALL_COMMAND ${MAKE_PRG} ${LUA_INSTALL_TOP_ARG} install)
+
 list(APPEND THIRD_PARTY_DEPS lua)
 
 set(BUSTED ${DEPS_INSTALL_DIR}/bin/busted)