diff options
| author | Justin M. Keyes <justinkz@gmail.com> | 2022-10-02 19:20:40 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-10-02 19:20:40 -0400 |
| commit | 56998feebd6f7ec0ab68e44cba3425bf39d448b4 (patch) | |
| tree | a292094f71be1f83aab74aaef20914c77ef2ebad /cmake.deps/cmake/BuildLua.cmake | |
| parent | 67e57d21b351a4fe4b32ec76998e45fe00d57186 (diff) | |
| parent | fbc66d798ce834c4ba05360c3c07ce7af40d6fc9 (diff) | |
| download | rneovim-56998feebd6f7ec0ab68e44cba3425bf39d448b4.tar.gz rneovim-56998feebd6f7ec0ab68e44cba3425bf39d448b4.tar.bz2 rneovim-56998feebd6f7ec0ab68e44cba3425bf39d448b4.zip | |
Merge #20154 build: cmake cleanup
Diffstat (limited to 'cmake.deps/cmake/BuildLua.cmake')
| -rw-r--r-- | cmake.deps/cmake/BuildLua.cmake | 13 |
1 files changed, 3 insertions, 10 deletions
diff --git a/cmake.deps/cmake/BuildLua.cmake b/cmake.deps/cmake/BuildLua.cmake index 58131a4ba7..fcc2f8ca25 100644 --- a/cmake.deps/cmake/BuildLua.cmake +++ b/cmake.deps/cmake/BuildLua.cmake @@ -28,7 +28,7 @@ if(CLANG_ASAN_UBSAN) endif() set(LUA_CONFIGURE_COMMAND - sed -e "/^CC/s@gcc@${CMAKE_C_COMPILER} ${CMAKE_C_COMPILER_ARG1}@" + sed -e "/^CC/s@gcc@${CMAKE_C_COMPILER}@" -e "/^CFLAGS/s@-O2@${LUA_CFLAGS}@" -e "/^MYLDFLAGS/s@$@${LUA_LDFLAGS}@" -e "s@-lreadline@@g" @@ -43,17 +43,10 @@ set(LUA_INSTALL_TOP_ARG "INSTALL_TOP=${DEPS_INSTALL_DIR}") message(STATUS "Lua target is ${LUA_TARGET}") ExternalProject_Add(lua - PREFIX ${DEPS_BUILD_DIR} URL ${LUA_URL} + URL_HASH SHA256=${LUA_SHA256} + DOWNLOAD_NO_PROGRESS TRUE 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} |