diff options
| author | Erik Kundiman <erik@megapahit.org> | 2024-08-12 15:30:31 +0800 |
|---|---|---|
| committer | Erik Kundiman <erik@megapahit.org> | 2024-08-12 15:30:31 +0800 |
| commit | 284a15878801969f75fd427a1be0a3ca1912e969 (patch) | |
| tree | 900cf6c95f83a244e7756e585ba54712e7e14035 /indra/cmake | |
| parent | 19d47a44d97a3b4fdd84cef9732e79d2708e4c12 (diff) | |
Remove unarchived dependencies after config/build
also fix ${_binary} to its intended fmodstudio name.
Diffstat (limited to 'indra/cmake')
| -rw-r--r-- | indra/cmake/FMODSTUDIO.cmake | 6 | ||||
| -rw-r--r-- | indra/cmake/Meshoptimizer.cmake | 4 | ||||
| -rw-r--r-- | indra/cmake/OpenJPEG.cmake | 4 |
3 files changed, 11 insertions, 3 deletions
diff --git a/indra/cmake/FMODSTUDIO.cmake b/indra/cmake/FMODSTUDIO.cmake index c5839f6174..9f82cf3db8 100644 --- a/indra/cmake/FMODSTUDIO.cmake +++ b/indra/cmake/FMODSTUDIO.cmake @@ -81,9 +81,9 @@ if (USE_FMODSTUDIO) ${AUTOBUILD_INSTALL_DIR}/lib/release/ ) execute_process( - COMMAND rm -rf /tmp/fmodstudioapi20223linux - WORKING_DIRECTORY "${CMAKE_SOURCE_DIR}" - RESULT_VARIABLE ${_binary}_installed + COMMAND rm -rf fmodstudioapi20223linux + WORKING_DIRECTORY /tmp + RESULT_VARIABLE fmodstudio_installed ) endif (DARWIN) file(WRITE ${PREBUILD_TRACKING_DIR}/fmodstudio_installed "${fmodstudio_installed}") diff --git a/indra/cmake/Meshoptimizer.cmake b/indra/cmake/Meshoptimizer.cmake index 7eb1d3cf77..f57dbb1be6 100644 --- a/indra/cmake/Meshoptimizer.cmake +++ b/indra/cmake/Meshoptimizer.cmake @@ -52,6 +52,10 @@ if (${LINUX_DISTRO} MATCHES fedora OR DARWIN OR NOT USESYSTEMLIBS) COMMAND cp /tmp/meshoptimizer-0.21/src/meshoptimizer.h ${AUTOBUILD_INSTALL_DIR}/include/meshoptimizer/ COMMAND cp /tmp/meshoptimizer-0.21/libmeshoptimizer.a ${AUTOBUILD_INSTALL_DIR}/lib/release/ WORKING_DIRECTORY ${AUTOBUILD_INSTALL_DIR} + ) + execute_process( + COMMAND rm -rf meshoptimizer-0.21 + WORKING_DIRECTORY /tmp RESULT_VARIABLE meshoptimizer_installed ) file(WRITE ${PREBUILD_TRACKING_DIR}/meshoptimizer_installed "${meshoptimizer_installed}") diff --git a/indra/cmake/OpenJPEG.cmake b/indra/cmake/OpenJPEG.cmake index 16603ac9e5..4a735e0041 100644 --- a/indra/cmake/OpenJPEG.cmake +++ b/indra/cmake/OpenJPEG.cmake @@ -39,6 +39,10 @@ if (USESYSTEMLIBS AND (${LINUX_DISTRO} MATCHES fedora OR DARWIN OR CMAKE_SYSTEM_ /tmp/openjpeg-2.5.2/src/lib/openjp2/opj_config_private.h ${AUTOBUILD_INSTALL_DIR}/include/openjpeg-2.5/ WORKING_DIRECTORY ${AUTOBUILD_INSTALL_DIR} + ) + execute_process( + COMMAND rm -rf openjpeg-2.5.2 + WORKING_DIRECTORY /tmp RESULT_VARIABLE openjpeg_installed ) file(WRITE ${PREBUILD_TRACKING_DIR}/openjpeg_installed "${openjpeg_installed}") |