diff options
| author | dundargoc <gocdundar@gmail.com> | 2022-09-29 21:46:14 +0200 |
|---|---|---|
| committer | dundargoc <gocdundar@gmail.com> | 2022-10-02 12:39:48 +0200 |
| commit | 59d5f692f8f563bf6f7c232f971ad764316e4466 (patch) | |
| tree | b79fedf7b1e566a5267818f14a1aea4fe5f7d113 /cmake.deps/cmake/BuildLuv.cmake | |
| parent | 913651d1f102eed11db9046fdec72e84958a7c6a (diff) | |
| download | rneovim-59d5f692f8f563bf6f7c232f971ad764316e4466.tar.gz rneovim-59d5f692f8f563bf6f7c232f971ad764316e4466.tar.bz2 rneovim-59d5f692f8f563bf6f7c232f971ad764316e4466.zip | |
build: rely on builtin cmake downloading rather than custom script
DownloadAndExtractFile.cmake was initially introduced as a workaround to
avoid the massive amounts of logs generated by the download progress.
This is not a problem anymore as ExternalProject_Add has had the
DOWNLOAD_NO_PROGRESS option since cmake version 3.1.
Diffstat (limited to 'cmake.deps/cmake/BuildLuv.cmake')
| -rw-r--r-- | cmake.deps/cmake/BuildLuv.cmake | 23 |
1 files changed, 5 insertions, 18 deletions
diff --git a/cmake.deps/cmake/BuildLuv.cmake b/cmake.deps/cmake/BuildLuv.cmake index 319602cd42..6b0360e363 100644 --- a/cmake.deps/cmake/BuildLuv.cmake +++ b/cmake.deps/cmake/BuildLuv.cmake @@ -58,15 +58,9 @@ endif() ExternalProject_Add(lua-compat-5.3 PREFIX ${DEPS_BUILD_DIR} URL ${LUA_COMPAT53_URL} + URL_HASH SHA256=${LUA_COMPAT53_SHA256} + DOWNLOAD_NO_PROGRESS TRUE DOWNLOAD_DIR ${DEPS_DOWNLOAD_DIR}/lua-compat-5.3 - DOWNLOAD_COMMAND ${CMAKE_COMMAND} - -DPREFIX=${DEPS_BUILD_DIR} - -DDOWNLOAD_DIR=${DEPS_DOWNLOAD_DIR}/lua-compat-5.3 - -DURL=${LUA_COMPAT53_URL} - -DEXPECTED_SHA256=${LUA_COMPAT53_SHA256} - -DTARGET=lua-compat-5.3 - -DUSE_EXISTING_SRC_DIR=${USE_EXISTING_SRC_DIR} - -P ${CMAKE_CURRENT_SOURCE_DIR}/cmake/DownloadAndExtractFile.cmake CONFIGURE_COMMAND "" BUILD_COMMAND "" INSTALL_COMMAND "") @@ -75,17 +69,10 @@ ExternalProject_Add(luv-static PREFIX ${DEPS_BUILD_DIR} DEPENDS lua-compat-5.3 URL ${LUV_URL} + URL_HASH SHA256=${LUV_SHA256} + DOWNLOAD_NO_PROGRESS TRUE DOWNLOAD_DIR ${DEPS_DOWNLOAD_DIR}/luv - DOWNLOAD_COMMAND ${CMAKE_COMMAND} - -DPREFIX=${DEPS_BUILD_DIR} - -DDOWNLOAD_DIR=${DEPS_DOWNLOAD_DIR}/luv - -DURL=${LUV_URL} - -DEXPECTED_SHA256=${LUV_SHA256} - -DTARGET=luv-static - # The source is shared with BuildLuarocks (with USE_BUNDLED_LUV). - -DSRC_DIR=${DEPS_BUILD_DIR}/src/luv - -DUSE_EXISTING_SRC_DIR=${USE_EXISTING_SRC_DIR} - -P ${CMAKE_CURRENT_SOURCE_DIR}/cmake/DownloadAndExtractFile.cmake + SOURCE_DIR ${DEPS_BUILD_DIR}/src/luv CONFIGURE_COMMAND "${LUV_CONFIGURE_COMMAND}" BUILD_COMMAND ${CMAKE_COMMAND} --build . --config $<CONFIG> INSTALL_COMMAND ${CMAKE_COMMAND} --build . --target install --config $<CONFIG> |