summaryrefslogtreecommitdiff
path: root/indra/cmake/Prebuilt.cmake
diff options
context:
space:
mode:
authorErik Kundiman <erik@megapahit.org>2024-08-16 15:49:03 +0800
committerErik Kundiman <erik@megapahit.org>2024-08-16 15:49:03 +0800
commitc63e212d30c1dccaaa1b8bce31023a8fd83923bb (patch)
treec47d3e4b8690153440fa6bbd135a0a34d7665049 /indra/cmake/Prebuilt.cmake
parent9f6d46604f628767f3ac701671d5678594852156 (diff)
parent90127cf36c5ca6e7c6273261830e65da2d7e9c73 (diff)
Merge branch 'main' into webrtc-voice
Diffstat (limited to 'indra/cmake/Prebuilt.cmake')
-rw-r--r--indra/cmake/Prebuilt.cmake16
1 files changed, 7 insertions, 9 deletions
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