From 493527ef5e33958970163a69f0d166654dde05cd Mon Sep 17 00:00:00 2001 From: Erik Kundiman Date: Fri, 16 Aug 2024 15:25:11 +0800 Subject: LL's prebuilt files are saved in build directory in their original names. --- indra/cmake/Prebuilt.cmake | 16 +++++++--------- 1 file changed, 7 insertions(+), 9 deletions(-) (limited to 'indra') diff --git a/indra/cmake/Prebuilt.cmake b/indra/cmake/Prebuilt.cmake index 9125864c1d..793da3338f 100644 --- a/indra/cmake/Prebuilt.cmake +++ b/indra/cmake/Prebuilt.cmake @@ -61,18 +61,16 @@ macro (use_prebuilt_binary _binary) OUTPUT_STRIP_TRAILING_WHITESPACE ) endif ("${package_url}" STREQUAL "") - execute_process(COMMAND curl - -L + string(REGEX REPLACE ^https://github.com/secondlife/3p-${_binary}/releases/download/v[0-9]+.*/ "" package_name ${package_url}) + file(DOWNLOAD ${package_url} - -o ${_binary}.tar.zst - WORKING_DIRECTORY /tmp + ${CMAKE_BINARY_DIR}/${package_name} ) - execute_process(COMMAND tar - xf - /tmp/${_binary}.tar.zst - WORKING_DIRECTORY ${AUTOBUILD_INSTALL_DIR} - RESULT_VARIABLE ${_binary}_installed + file(ARCHIVE_EXTRACT + INPUT ${CMAKE_BINARY_DIR}/${package_name} + DESTINATION ${AUTOBUILD_INSTALL_DIR} ) + set(${_binary}_installed 0) else(USESYSTEMLIBS) execute_process(COMMAND "${AUTOBUILD_EXECUTABLE}" install -- cgit v1.2.3