diff options
| author | Erik Kundiman <erik@megapahit.org> | 2024-08-16 15:25:11 +0800 | 
|---|---|---|
| committer | Erik Kundiman <erik@megapahit.org> | 2024-08-16 15:25:11 +0800 | 
| commit | 493527ef5e33958970163a69f0d166654dde05cd (patch) | |
| tree | 0b8acce795b2216ca22261ea32e204f177e952a3 /indra/cmake | |
| parent | ddd92b44c4248f90d6f1eca653fa9763ec766b80 (diff) | |
LL's prebuilt files are saved in build directory
in their original names.
Diffstat (limited to 'indra/cmake')
| -rw-r--r-- | indra/cmake/Prebuilt.cmake | 16 | 
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  | 
